man
Merge branch 'master' of https://github.com/krgauthi/LD48
renamed html
Merge remote-tracking branch 'origin/master'

Conflicts:
Stupid android studio errors
new app
forgot the .idea
merged
Receiver handler
merged