pre chandler merge
Merge branch 'master' of github.com:mattmarcello/party_drugs_crud

Conflicts:
	app/controllers/party_drugs_controller.rb
Merge chandler