angular skeleton
Merge branch 'master' of github.com:tshriram02/MarkV

Conflicts:
	.gitignore
	app/index.html