first commit
jenkins test
Merge branch 'master' of github.com:/ITS-UofIowa/sitenow_apps

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