Syncing between multiple commits, no change.
Merge branch 'master' of https://github.com/thebishopgame/Initiative

Conflicts:
God dammit fucking work you piece of shit