Fixed a few things
Changes for heroku
Merge branch 'master' of https://github.com/CzarcasticJack/FinalSoft