Added stubs for mergeFasta and convertGff

Also a lot of whitespace changes and some tests.
merge gff files implemented
Implemented mergeFasta
Merge pull request #17 from mitchellwrosen/speedup

lab5
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
Added eclipse formatter

Shoulda done this week one.
Changed signatures of mergeFasta() and convertAndMergeGFF()

Also too much white space change.
Merge branch 'master', remote-tracking branch 'origin' into stearns-ui
Started to hook the zip reader to underlying code