Merge branch 'master' of https://github.com/markan82/diary.git

Conflicts:
	.gitignore