Started work on factions
Merge branch 'master' of github.com:samlauber/postapoc