Fixed some last minute bugs
Merge branch 'master' of github.com:zachmorgan/Final-Project