Some merging (not the git kind)
Merge branch 'master' of https://github.com/alexjlockwood/android-2048