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

Conflicts:
	web_site/app.js