new
Merge branch 'master' of https://github.com/Tao-PersonalFiles/Spring2014

Conflicts:
	CS
383/Implement_Spells/build/classes/implement_spells/Implement_Spells.cla
ss
	CS 383/Implement_Spells/build/classes/implement_spells/Spell$1.class
	CS 383/Implement_Spells/build/classes/implement_spells/Spell$2.class
	CS 383/Implement_Spells/build/classes/implement_spells/Spell$3.class
	CS 383/Implement_Spells/build/classes/implement_spells/Spell$4.class
	CS 383/Implement_Spells/build/classes/implement_spells/Spell.class
	CS
383/Implement_Spells/build/classes/implement_spells/spells/CastSpell.cla
ss
	CS
383/Implement_Spells/build/classes/implement_spells/spells/PL_2/Manna_Tr
ansfer.class
	CS 383/Implement_Spells/nbproject/private/private.xml
	CS 383/Implement_Spells/src/implement_spells/Implement_Spells.java
	CS 383/Implement_Spells/src/implement_spells/Spell.java
	CS
383/Implement_Spells/src/implement_spells/spells/PL_2/Manna_Transfer.jav
a