New additions
Merge branch 'master' of https://github.com/Webb-2/Kollosidan

Conflicts:
	main.scss
	tools/_globals.scss