change id
Merge branch 'master' of https://github.com/jhatton/woundedwarriors

Conflicts:
	about.html
	css/main.css