Merge pull request #6 from tylyan/master

Added refresh button
Removed 'merge' files
update ui.js