init repo
Merge branch 'master' of github.com:poppo53/toy_app

Conflicts:
	.gitignore

"add gitignore"