Stuff
Merge branch 'master' of https://github.com/ajbowler/ShakeOff

Conflicts:

MyApplication/app/src/main/java/com/example/zplata/shakeoff/ShakeOff.jav
a
Merge branch 'master' of https://github.com/ajbowler/ShakeOff