additional items
Merge branch 'master' of https://github.com/Dwarfius/SummerUniGameJam2014

Conflicts:
	GameJamUnityProject/Assets/Scenes/TestScene.unity