Add Tests

Not sure why cbp is changed.
Merge remote-tracking branch 'origin/master'

Conflicts:
	SDL Tutorial 7.layout