Merge origin/master

Conflicts:
	.gitignore
	Collections/src/collections/Collections.java
	Collections/src/collections/MyArraySet.java