resolved merge conflict
Merge branch 'master' of github.com:ITS-UofIowa/diversity2.uiowa.edu