Adding teams in navigation
Merge branch 'master' of github.com:ppapadeas/areweamillionyet

Conflicts:
	js/main.js