line ending issue
Merge branch 'master' of github.com:ITS-UofIowa/sitenow_apps