.
Merge branch 'master' of github.com:fsalaysay/sidebartest

Conflicts:
	src/js/globals.js
	src/sass/style.scss
	src/sass/unprefixed/style-unprefixed.css
	src/sass/unprefixed/style-unprefixed.css.map
fixed