Merge branch 'master' of github.com:Beeks/Ascent

This commit is contained in:
Beeks
2010-09-19 16:13:03 -04:00