Initial commit
Merge branch 'master' of github.com:CodeTheCity/matchthecity

Conflicts:
	.gitignore