Diana's changes
Merge branch 'master' of https://github.com/03knoppg/ToJam2014

Conflicts:
	Assets/Scripts/Controls/Contols.cs
Merge branch 'master' of https://github.com/03knoppg/ToJam2014

Conflicts:
	Assets/Scripts/Controls/Contols.cs