new https server - need to migrate all incoming requests to https
readded deleted entry
arrgh - should be commented out
added foreman
fixed conflicts
Merge branch 'master' of https://github.com/jeong-codefellows/MixologyApp