minor changes
Merge branch 'master' of https://github.com/Team-Mango/Teamwork
Merge branch 'master' of https://github.com/Team-Mango/Teamwork
new content in contacts.html
Merge branch 'master' of https://github.com/Team-Mango/Teamwork
Merge remote-tracking branch 'origin/master' into team

Conflicts:
	.idea/workspace.xml
	contacts.html