added index2, built on angular
added material elements to index2
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/index.html