Merge branch 'master' of https://github.com/vendeloo/mywishes

Conflicts:
	.gitignore
	LICENSE
	README.md