Merge pull request #2 from ozamorowski/master

[wip] compilation fixes
Add test page for scss
compass
testing...
Merge remote-tracking branch 'upstream/master'

Conflicts:
	test/scss/css/custom.scss
compass