dark
Merge branch 'master' of https://github.com/kelthalas/gamechallenge2014-9
Merge branch 'master' of https://github.com/kelthalas/gamechallenge2014-9
Merge branch 'master' of https://github.com/kelthalas/gamechallenge2014-9
wtf
Merge branch 'master' of https://github.com/kelthalas/gamechallenge2014-9

Conflicts:
	Assets/Prefabs/Fille.prefab
	Assets/Scripts/AfraidOfTheDark.cs