Bugfixes

Changes to be committed:
	modified:   assets/css/main.css
	modified:   assets/sass/main.sass