Cleaned up Git
Merge branch 'gui_dev'
Merge branch 'gui_dev'
Trying to commit again
Deleted hsmrs_gui to start again
Still fixing the git
Merge branch 'gui_dev'
Fixed merge conflicts because of metadata
Set wall-e as the default image, working on map overlay now
Merged with master, I thought I fixed the git but it seems there are still some problems