kljsfs
Merge branch 'new-design' of https://github.com/araquach/contra_design into new-design

Conflicts:
	css/contradesign.css