Edited a bunch of code.
Merge branch 'master' of https://github.com/jykoko/HackFSU