conflict resolution
Merge branch 'master' of https://github.com/sobingt/psychic-octo-robot
Basic Web UI
Basic UI