test
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014

Conflicts:
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/guidmapper
	Project/Library/metadata/24/2490beacbda018f4eb57c04abb76d6c6
	Project/Library/metadata/56/56f9cd42d9f9543468bf2f276ef2c739
	Project/Library/metadata/7f/7f316b7db58890e4cb0e392134001c03
	Project/Project-csharp.sln
	Project/Project.sln
	Project/Temp/UnityTempFile-00d7bd2a42ea4dd4e9265784f4121fcf
	Project/Temp/UnityTempFile-6a438c4f12d94104986badc80524c89c
	Project/Temp/UnityTempFile-7173208d3ec70df4fa5198454dc5ef97
PowerUp
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014

Conflicts:
	Project/Library/CurrentLayout.dwlt
	Project/Library/InspectorExpandedItems.asset
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/guidmapper
	Project/Library/metadata/65/658abec2b47b172438ec44f3c34f0911
	Project/Library/metadata/76/76e290fe5bd3c684aa93dd323a0e1082
	Project/Library/metadata/7f/7f316b7db58890e4cb0e392134001c03
	Project/Project-csharp.sln
	Project/Project.sln
	Project/Temp/UnityTempFile-3afc7dfc930acad4ca0d0edda2c6835d