Added Grunt to this project. Currently watching SASS changes. Got 960.gs using grunt-contrib-compass
Merge branch 'master' of github.com:aeyang/harmonious

Conflicts:
	Log.log