further students work
Merging level framework
Merge branch 'master' of github.com:jackpaparian/Hamerschlag_Defense
more general bug fixes
Added better "line of sight" method for student dodging, fixed bugs

Also cleaned up/rearranged alot of dead/inefficient code
Merge branch 'master' of github.com:jackpaparian/Hamerschlag_Defense

Conflicts:
	grid.js
	init.js
Fixed merge conflicts, added "depth" to rows
Merge branch 'master' of github.com:jackpaparian/Hamerschlag_Defense

Conflicts:
	grid.js
	init.js
	student.js
Resolved merge conflicts.
Animated Carnegie, merge resolutions, bug fixes
merges resolved