updates to team
Merge branch 'master' of github.com:DatTran/vyc5

Conflicts:
	app/index.html