Initial commit V1.0
Merge remote-tracking branch 'origin/master'

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