test commit "hello"
Merge branch 'master' of https://github.com/Taitsu/practices

Conflicts:
	.gitignore
remove conflict .gitignore