Initial commit
Merge branch 'master' of https://github.com/pappabear/MyDay

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/pappabear/MyDay

Conflicts:
	.gitignore