Scoring works! One problem though..

scoring goes up every tick.. op or?
Merge remote-tracking branch 'origin/master'

Conflicts:
	Solitare/Level.h