Some initial work
Merge branch 'master' of git@github.com:ssachtleben/herowar.git