too tired to think

changes and shit
Merge branch 'master' of https://github.com/kvelury/apocalyptia