init commit
Merge branch 'master' of github.com:nicangeli/citypicker

Conflicts:
	.gitignore