Init commit.
Merge branch 'master' of github.com:jclevine/war-challenge

Conflicts:
	.gitignore