Merge branch 'master' of https://github.com/chang47/LunchWithFriends

Conflicts:
templates/index.html
merging!!!!!