Added a mockup article
fixed conflict

Conflicts:
	app/styles/_reset-inuit.scss
	app/styles/main.scss
	app/views/main.html