modify specs
Merge branch 'master' into controller_rspec
update master
places_controller_spec updated w/ rspec
updating controller &  model rspecs; and footer
Merge branch 'controller_rspec'
merging controller_rspec to remote master
fixed conflicts