character selection screen
Merge branch 'master' of https://github.com/Snakybo/GameJam2014

Conflicts:
	Assets/Scripts.meta