fixeth thee mapeth
Merge branch 'master' of https://github.com/AVATAR-PANIC/AVATAR-PANIC.git
Last commit before I screw up the code.