working on lab 7
Merge origin/master

Conflicts:
	Windows NT 6.1 Workstation Profile.V2/Documents/NetBeansProjects/Java_Examples/src/examples5b/SelectSort.java

Working on 7