bullshitstuff
Merge branch 'master' of https://github.com/IanRT/Exercise4.git

Conflicts:
	Exercise4/src/exercise4/search/SearchAlgorithm.java