init
Merge branch 'master' of github.com:casiotone/mlkdayapp

Conflicts:
	.gitignore