20140307
20140307
Merge branch 'master' of github.com:codepongo/diary

Conflicts:
	md/2014-03-07.md
template.md format is unix
mp3 flash player
20140310