sample solns for lesson 12
Merge branch 'master' of https://github.com/generalassembly-studio/CSF_Homework

Conflicts:
	Lesson12/src/Search.java
	Lesson12/src/Sort.java
fixing my github