Changing formatting of search results
Changing formatting of search results
added rudimentary devise implementation
Merge pull request #39 from coreycondardo/issue-17-fix

Issue 17 fix
Adding admin functionality
Merge pull request #40 from coreycondardo/issue-12-fix

Issue 12 fix
add gemset file
remove spring, foreman gems
Merge branch 'master' into no-spring-foreman

Conflicts:
	Gemfile.lock
Merge pull request #42 from hackforwesternmass/no-spring-foreman

No spring, foreman gems
multiple selections no longer mutually exclusive for agency type id
Merge pull request #43 from hackforwesternmass/multiple-selections-in-program-menu-produce-no-results-#32

multiple selections no longer mutually exclusive for agency type id
Update README.rdoc
Update README.rdoc
Merge branch 'master' into Resource-Type-Formatting

Conflicts:
	app/assets/javascripts/ajax.js