Getting latest
Conflicts resolved
updates not work
Merge pull request #10 from otorres86/master

new UI work