simplified rooGame
converted some things to jsp files
merged changes
Merge branch 'master' of https://github.com/EthanSoch/CSC324-Team-1.git

Conflicts:
	rookGame/.settings/org.eclipse.wst.common.component
	rookGame/.settings/org.eclipse.wst.common.project.facet.core.xml
	rookwithfriends/.project
	rookwithfriends/war/css/style.css
	rookwithfriends/war/index.html
	rookwithfriends/war/js/animation.js
	rookwithfriends/war/js/rook.js