update on ui for jsm
working ui/server updates for jsm
update to gitignore for shinyapps
something
cleanup
merge conflicts