Initial Commit
erge branch 'master' of https://github.com/leemac/LifeLog

Conflicts:
	.gitignore
te:x