Fix: type FixNum -> Fixnum
Merge pull request #7 from zmoshansky/shea

Fix: type FixNum -> Fixnum
Merge pull request #6 from zmoshansky/heather

button styling and nag changes
Merge pull request #8 from zmoshansky/heather

activity list
Added pharmacy list and partials
Fix: typo 'itme' -> 'item'
Merge pull request #9 from zmoshansky/shea

Added pharmacy list and partials
Merge branch 'master' into heather

Conflicts:
	app/views/pharmacies/index.html.erb
pharmacy styles