initial angularjs setup
rough markup table/form
switching branches
input boxes
Merge branch 'markup'

Conflicts:
	main.js