fixed a few bugs. I think we are in business now!
Merge branch 'master' of https://github.com/bradywatkinson/1927ass2