wrap up changes
Merge branch 'master' of https://github.com/trills/mocha2

Conflicts:
	app/views/fellows/_choose_friends.html.erb