changed team page
Merge branch 'develop' of github.com:orobix/orobix.github.com into develop

Conflicts:
	css/main.css