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
Committing Changes

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/Rectangle.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Terrain.java
	magicprogram/src/edu/ycp/cs320/magicprogram/shared/Tower.java
	magicprogramUI/.classpath
	magicprogramUI/.settings/com.google.gdt.eclipse.core.prefs
	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 Kill Counter and Money system
5/1 fix completed