commit
Merge branch 'master' of https://github.com/mrcouthy/Practice

Conflicts:
	.gitignore