added redcarpet gem, every bundle
Merge branch 'master' into hangwork

Conflicts:
	app/views/users/edit.html.erb
	app/views/users/show.html.erb