minor map stuff
Merge branch 'master' of https://github.com/ysugiant/grubber

Conflicts:
	Grubber/src/com/example/grubber/Results.java
Merge branch 'master' of https://github.com/ysugiant/grubber
Merge branch 'master' of https://github.com/ysugiant/grubber
added icons
minor stuff and set up stuff for tabs
Merge branch 'master' of https://github.com/ysugiant/grubber
deleted extra files