scss variables bug
Merge branch 'master' of https://github.com/nuclearflames/djwebsite

Conflicts:
	app/assets/stylesheets/application.scss.erb
scss, 404 page and started merge of images in scss files