Added some early UI development for lab 6
Added stubs for mergeFasta and convertGff

Also a lot of whitespace changes and some tests.
merge gff files implemented
Began lab6 UI rework.

Added *general* look of the UI. There is some more work to do.
Implemented mergeFasta
Reset View.java
Merge branch 'stearns-ui' into erik-suffix-tree

Conflicts:
	src/controller/Controller.java
Merge pull request #18 from mitchellwrosen/erik-suffix-tree

Erik suffix tree