my stuff
Merge branch 'master' of
https://github.com/MoistyMoist/IT3176-Android-Development-Assigment.git