..
Merge branch 'master' of https://github.com/miser/MarriedDiary

Conflicts:
	routes/index.js