jobs
Merge branch 'master' of github.com:startupvictoria/membership-site

Conflicts:
	app/views/about/us.html.haml