level1
starting level2
level2 stuff
Merge remote-tracking branch 'origin/master' into chris

Conflicts:
	Assets/Levels/level1.unity
	Assets/Prefabs/Hero.prefab
	Assets/Prefabs/PlatformSlider.prefab
	Assets/Prefabs/SpringBase.prefab
	Assets/Prefabs/SpringBase.prefab.meta
	Assets/Sprites/blue.png
	Assets/Sprites/blue.png.meta
	Assets/Sprites/bluemagnet 2.png
	Assets/Sprites/bluemagnet 2.png.meta
	Assets/Sprites/red2.png
	Assets/Sprites/red2.png.meta
	Assets/Sprites/redmagnet.png
	Assets/Sprites/redmagnet.png.meta
	Assets/Sprites/spritesheet_white.png
	Assets/Sprites/spritesheet_white.png.meta
	ProjectSettings/EditorSettings.asset
	ProjectSettings/Physics2DSettings.asset
	ProjectSettings/TagManager.asset
Merge branch 'master' into David

Conflicts:
	Assets/Levels/level1.unity
	Assets/Levels/level2.unity
	Assets/Levels/level2.unity.meta
	Assets/Prefabs/Hero.prefab