Removed git conflict files
Split out the gruntfile
Added compass grunt task and initial Sass file