gnore
ignore
getting rid of script that silly
renaming
deleting stuff we dont need
deleting stuff
Merge pull request #6 from GabrielAppleby/gabriel

Gabriel
Connor TODO Things

Adam's Tech Demo has new spells in it.  There is a level1 scene that
makes a map and spawns enemies.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Resources/Scripts/ConnorGameManager.js
Revert "Connor TODO Things"

This reverts commit fdbb111e4010bf6e67ba18b208c8124281e31d61.
Revert "Revert "Connor TODO Things""

This reverts commit 65addac0c3f70e38708ff2faae4a4e493ce18c63.
Removed Files for Gabe

Removed Files for Gabe
Add Spellbook

Added spellbook script
Also the Lux ult sound because we'll use it somewhere.
Made Level1GameManager work

Rewrote methods in AdamGameManager into Level1GameManager. Updated
player and enemy scripts accordingly.
Finished spellbook script
Models are more closely attached to their objects.
Saved the scene

I forgot to do that don't know what this changes.
Removed Warnings

Removed compilation warning (was a problem with GetComponent)
This should not delete Spellbook

I don't know why it wants to
Fixing Conflicts

In player2D.
Apologies for all the commits, merging is annoying.
Merge pull request #8 from GabrielAppleby/master

Pulling changes to Adam branch