adding more people!
Merge branch 'master' of https://github.com/bjryan2/intern-common-app

Conflicts:
	app/views/users/dashboard.html.erb