Refactor junk, add form stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/example/fuzzer/BasicFuzzer.java