Retry
Merge branch 'master' of https://github.com/givaway/ludum_dare_29

Conflicts:
	Assets/Resources.meta