Merge branch 'simplified' of github.com:ITS-UofIowa/uiowa_bar into simplified