Initial commit
Merge branch 'master' of https://github.com/naturtrunken/my_places

Conflicts:
	.gitignore
Merge branch 'develop'

Conflicts:
	.gitignore
Note added for the first release version in the readme file.
Merge branch 'master' into develop