test
Merge remote-tracking branch 'origin/master'

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