Moved stuff around
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Standard Assets/Scenes/LudumDare2014.unity
Yay cool dunes
Merge branch 'master' of https://github.com/Junuxx/LudumDare

Conflicts:
	Assets/Standard Assets/Scenes/LudumDare2014.unity