init
Merge branch 'master' of github.com:muukii0803/Garage

Conflicts:
	.gitignore