Merge branch 'master' of https://github.com/youkaithegreat/CodeClicker

Conflicts:

app/src/main/java/com/kevintyang/codeclicker/codeclicker/MyActivity.java
Trying to fix this conflict