Merge branch 'master' of https://github.com/disorder81/army-builder

Conflicts:
	Gemfile.lock
	server.rb