Edited view 1 and 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/view1/view1.html
	app/view2/view2.html