Merge Conflict Again
Merge branch 'master' of https://github.com/gemarcano/SWEN-Fuzzer.git

Conflicts:
	src/fuzzer/apps/fuzzer.java