Merge pull request #12 from GabrielAppleby/Adam

Made the rocks right side up
WARRIORS

WARRIORS
warriors actually

aefawef
Made archers have shorter range

Also the deck actually shuffles
The deck is no longer made of Lux

:(
Skinnier Arrows
I still dont know how conflicts

arefaekr n
Made arrow hitboxes more accurate

and made a better dart
Global Cooldown

Implemented
SPELLS

SPLLESELDSPEL
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Resources/Scripts/player2D.js
changed dart icon

fo real
Longsword icon
leap is half complete

HELP ME ADAM
Leap is done
everything but collision :(
SUPER SHITTY COLLISION, IT ONLY TOOK 8 HOURS.  WHO BELIEVED IN ME? WAS IT YOUIOU?? MI AMOR <333
Enemies are of random types
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Resources/Scripts/Level1GameManager.js
Slightly less derpy health bars