fixed
Merge branch 'master' of github.com:NinjaTurtles/CaptureTheFlag

Conflicts:
	Web/.gitignore