activity list
Merge branch 'master' into heather

Conflicts:
	app/views/pharmacies/index.html.erb
pharmacy styles
Merge pull request #10 from zmoshansky/heather

Heather