1
Merge branch 'dev' of https://github.com/Staphylococcus/homework into dev

Conflicts:
	public/modules/contacts/css/core.css
Made it sassy + google fonts