Updated stuff for reasons and things.
Merge branch 'master' of https://github.com/Lineaweaver/ActivityApplication.git