basic ui complete
Merge branch 'master' of https://github.com/nbingham1/Patch