final commit
Merge branch 'master' of https://github.com/Markwallow/theCircle

Conflicts:
	app/views/layouts/application.html.erb
best build evar