Working on class
Merge branch 'master' of https://github.com/daniel-hanson/Android-ACM-2048