updated constructor test
constructors tested
constructor fix
Merge branch 'jhath16-justin-branch'
fixed test file
try again
commit
Merge branch 'constructor-1' of https://github.com/chad-m/Constructors-game into chad-m-constructor-1

Conflicts:
	app/index.html
	app/scripts/main.js
	test/index.html
committed
lots of design done
implemented constructors
lots of style
more
pre-merge
Merge branch 'ollie'
 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
Some fighters added, animationdone