minor changes
Merge branch 'master' of https://github.com/Team-Mango/Teamwork

Conflicts:
	css/style.css