more ignore crap
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	Semester 3/Computer Science/Assignments/Sorting
Arrays/SortingArraysProject/nbproject/private/private.xml