got some of the power ups working
Merge branch 'master' into taylor09-30-2014

Conflicts:
	Assets/Scenes/Main - Lives.unity