Moved arena from test to main scene; ignored Cody's prefab.
Merge commit '17bebf0546ea8519b0b78cbce5f231603f14b40a'

Conflicts:
	GrizzlyIntentions/Assets/MainScene.unity
Merge branch 'master' of https://github.com/spennerino/NewPegJamRepo2014

Conflicts:
	GrizzlyIntentions/Assets/MainScene.unity