Merge remote-tracking branch 'pholtz/master'
Merge remote-tracking branch 'mcifelli/master'
Merge remote-tracking branch 'pholtz/master'

Conflicts:
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/GameView.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/MagicprogramUI.java
Merge remote-tracking branch 'mcifelli/master'

Conflicts:
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Creep.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Game.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/MagicprogramUI.java
Merge remote-tracking branch 'pholtz/master'
Merge remote-tracking branch 'mcifelli/master'

Conflicts:
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Creep.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Game.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/GameView.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/MagicprogramUI.java
Merge remote-tracking branch 'pholtz/master'
Added "range" around towers. This is temporary and helps determine when
creeps are in range of tower.

Todo:
Need to make a way to compare location of towers to creeps
I am going to make an arraylist "towpoints" where points are added
during the onMousedown event. From there the points will be compared and
if they are in range, creeps are removed.
Tower ranges
Towers
jkhg
rpc call added
Merge remote-tracking branch 'mcifelli/master'

Conflicts:
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Creep.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Game.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Point.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Structure.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/GameController.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/GameView.java
solved rendering issues. made towers attack creeps. added a creep
spawner structure.
Merge remote-tracking branch 'mcifelli/master'
changes to levelserviceimpl
d
Merge remote-tracking branch 'mcifelli/master'

Conflicts:
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Creep.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Game.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Structure.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/GameController.java
deleted stack resource call
Merge remote-tracking branch 'mcifelli/master'

Conflicts:
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Creep.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Game.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Point.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Structure.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/GameController.java
	magicprogramUI/src/edu/ycp/cs320/magicprogram/client/GameView.java