fuck you git

Conflicts:
Merge branch 'dev' of https://github.com/PunctualEmoticon/Helium-3 into dev