commit - changes
Merge remote-tracking branch 'origin/Charly'
git ignore changes
git ignore changes
git ignore changes
git ignore changes
git ignore changes
interface structure added
Merge remote-tracking branch 'origin/master' into Charly

Conflicts:
	.gitignore