Initial commit
Merge branch 'master' of github.com:wassabieboi/lunchathon-2.0

Conflicts:
	.gitignore