user emailed when new restaurant approved
corrected test describe
restaurant_feature_spec test correction
merge conflict resloution
Merge branch 'staging' of github.com:JonahMoses/fourth_meal into staging