Improved the controls
Merge branch 'master' of github.com:jharger/ggj14
Merge branch 'master' of github.com:jharger/ggj14
New sprites and such
Merge branch 'master' of github.com:jharger/ggj14

Conflicts:
	Assets/Art/TileSheets/Dwarf_Miner.png.meta
	Assets/Art/TileSheets/Dwarf_Ruler.png.meta
	Assets/Art/TileSheets/Elf_Vampire.png.meta
	Assets/Art/TileSheets/Imp.png.meta
	Assets/Art/TileSheets/JnRLayer01.png.meta
	Assets/Art/TileSheets/JnRTiles.png.meta
	Assets/Art/TileSheets/NightPortal.png.meta
	Assets/Art/TileSheets/NorthernHuman.png.meta
	Assets/Art/TileSheets/Portalsnow.png.meta
	Assets/Art/TileSheets/Seaserpent.png.meta
	Assets/Art/TileSheets/Shroom.png.meta
	Assets/Art/TileSheets/Shroom_Small.png.meta
	Assets/Art/TileSheets/Soldier.png.meta
	Assets/Art/TileSheets/Soldier2.png.meta
	Assets/Art/TileSheets/Tentacle.png.meta
	Assets/Art/TileSheets/castleBackground.png.meta
	Assets/Art/TileSheets/castleTiles2.png.meta
	Assets/Art/TileSheets/dawn_of_the_gods_0.png.meta
	Assets/Art/TileSheets/dirt.png.meta
	Assets/Art/TileSheets/gems_db16.png.meta
	Assets/Art/TileSheets/grass_9.png.meta
	Assets/Art/TileSheets/grass_9fall.png.meta
	Assets/Art/TileSheets/nightTilesA.png.meta
	Assets/Art/TileSheets/snowTiles.png.meta
	Assets/Art/TileSheets/town_0.png.meta
	Assets/Art/TileSheets/trees_1.png.meta
	Assets/Art/TileSheets/trees_plants_0.png.meta
	Assets/Art/TileSheets/trees_plants_rocks_0.png.meta
	Assets/Art/TileSheets/zombie_n_skeleton2.png.meta