broken art
5-9-2014 1617
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
water failed to be added last time
Merge pull request #31 from DevenSmith/master

SwordEnemy added, needs to be on a navmesh
swordEnemy on navmesh
adding in obj files
nothing
added obj.meta files
changes to some prefab stuff
player fix
5-14-2014 1608

fixed the monk staff spin and adjusted power up drop rate
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
Merge pull request #32 from DevenSmith/master

5-14-2014 1614 I dont request a pull I demand it
Delete presBuild.exe
Delete stevenbuild.exe
Delete sharedassets1.assets
Delete sharedassets0.assets
Delete mainData
Delete level0