Mergin from Trunk. Wish us luck.
Merge branch 'master' of https://github.com/EthanSoch/CSC324-Team-1.git

Conflicts:
	rookGame/.classpath
	rookwithfriends/.classpath
	rookwithfriends/war/js/rook.js