Added background, changed renderers
Merge branch 'master' of https://github.com/jonmann20/GameJam14

Conflicts:
	Assets/Resources/PlayerPrimary.prefab
	Assets/Scenes/main.unity
	Assets/Scripts/Controller.cs
	Assets/Scripts/Player.cs