submodule add
submodule add log
new .gitignore
Merge branch 'master' of github.com:tkabeee/roomus

Conflicts:
	.gitignore