Adding grunt task for generating CSS styles from Sass files.
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json