setup
Merge branch 'master' of https://github.com/barbaraz/practice

Conflicts:
	.gitignore