chris's initial entry
Toggle magnetic object with force generator
Reserialized to text :/
Art files for Hero and blocks
Merge remote-tracking branch 'origin/Hung'

Conflicts:
	Assets/Levels/level1.unity
	Assets/Prefabs/Box.prefab
	Assets/Prefabs/Hero.prefab
	ProjectSettings/Physics2DSettings.asset
	ProjectSettings/ProjectSettings.asset
	ProjectSettings/TagManager.asset
Merge branch 'master' of https://github.com/Matt343/jolly-polarity-game into David

Conflicts:
	Assets/Levels/level1.unity
	Assets/Levels/titlescreen.unity
	Assets/Prefabs/Box.prefab
	Assets/Prefabs/Hero.prefab
	ProjectSettings/EditorBuildSettings.asset
	ProjectSettings/GraphicsSettings.asset
	ProjectSettings/InputManager.asset
	ProjectSettings/Physics2DSettings.asset
	ProjectSettings/TagManager.asset