Fixed meteor again.

10 second timer though. Have to fix for final release
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Level.unity
	DBS-Game-Jam-Repo.userprefs
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
Merge branch 'master' of https://github.com/ang1990/DBS-Game-Jam-Repo

Conflicts:
	Library/assetDatabase3
	Library/guidmapper