213
Merge branch 'master' into task3

Conflicts:
	Minibase/bin/.gitignore