basic setup
Merge branch 'master' of https://github.com/working-title-2/impact