Added some last minute stuff
Merge branch 'master' of https://github.com/AshtonO/TonysAndroid.git
DONE!