-First update! Yeah!
Merge branch 'master' of https://github.com/mraaaah/AEMI_GameJam_H14

Conflicts:
Merge branch 'master' of https://github.com/mraaaah/AEMI_GameJam_H14