not a real commit
Merge branch 'master' of https://github.com/chang47/LunchWithFriends

Conflicts:
	templates/js/index.js