score stuff
Merge branch 'master' of https://github.com/arellanj/Current

Conflicts:
	level.h