Removed unnecessary scss
Fix for feature 2 js
Merge branch 'release-0.1'

Conflicts:
	scripts/feature2.js