starting the UI
fixed conflict
Merge pull request #10 from benheb/master

UI work