fixes some bugs, app now fully works. Also makes a few small changes
Merge branch 'master' of github.com:ColbyAley/CodeForMe