Test gitignore.
Merge branch 'master' of https://github.com/danielamariei/TeTwix

Conflicts:
	.idea/workspace.xml