Merge pull request #16 from Make-Magazine/develop

Develop
Control all the things

line 3 of card is trying unsuccessfully to replace that string, advice
please?
Push It baby
Merge branch 'projects' into develop
Merge branch 'develop' of https://github.com/Make-Magazine/makerapp into develop

Conflicts:
	app/views/shared/_main_nav.html.erb