Started on powerups
Merge branch 'master' of https://github.com/jonmann20/GameJam14

Conflicts:
	Assets/Scenes/main.unity
Merge branch 'master' of https://github.com/jonmann20/GameJam14

Conflicts:
	Assets/Resources/ChainLink.prefab
	Assets/Scenes/main.unity
	ProjectSettings/TagManager.asset