basic ui
fixed conflicts
ui integration
Merge pull request #3 from pahans/ui

basic ui
Merge branch 'master' into Develop