yo
Merge branch 'master' of https://github.com/RamiAhmed/NordicGameJam_Game2014
mergecommit
Merge branch 'master' of https://github.com/RamiAhmed/NordicGameJam_Game2014

Conflicts:
	Game/Assets/Scripts/DynamicObstacle.cs
Merge branch 'master' of https://github.com/RamiAhmed/NordicGameJam_Game2014

Conflicts:
	Game/Assets/Scripts/DynamicObstacle.cs
fixed merge bug