Fixed a number of problems with if/else logic.
Merge branch 'master' of http://github.com/Crockeo/finalproject