init
merge
Merge branch 'master' of github.com:24hr-malmo/service.proximity

Conflicts:
	.gitignore
	README.md