Removed comments from js
Merge branch '18coffees-dev' into 18coffees-master
Matched logo file name to file
Removed comments from form
Merge branch '18coffees-dev' into 18coffees-master
Switched form email to Caleb's
Merge branch '18coffees-dev' into 18coffees-master