updates
Merge branch 'gh-pages' of github.com:NinjaTurtles/CaptureTheFlag into gh-pages

Conflicts:
	index.html
	params.json