temp
upd

Merge branch 'master' of https://github.com/kablag/RDML

Conflicts:
	inst/RDML_gui/server.R
	inst/RDML_gui/ui.R