implemented constructors
 fixes constructors
Merge branch 'master' into ui-2

Conflicts:
	app/index.html
	app/scripts/main.js
	test/index.html
integrated js and html
changed js
Merge pull request #4 from chad-m/ui-2

Ui 2