my first commit
Merge branch 'master' of ssh://github.com/dcoli/lunchmo

Conflicts:
	.gitignore