up
Merge remote-tracking branch 'origin/master'

Conflicts:
	style.css
Merge branch 'master' of https://github.com/ArgTang/Team-Warrior