compass
Merge remote-tracking branch 'upstream/master'

Conflicts:
	test/scss/css/custom.scss
compass
Merge pull request #3 from ozamorowski/master

added compass and test case