Added to .gitignore
Merge branch 'master' into test
Merge branch 'master' into test
Merge branch 'master' into test
Merge branch 'master' into test
Merge branch 'master' into test
Merge branch 'master' into test
Merge branch 'test' of github.com:ITS-UofIowa/ip.uiowa.edu into test

Conflicts:
	.gitignore
Merge branch 'master' into test
.gitignore
Merge branch 'master' into test
Merge branch 'master' into test
Merge branch 'master' into test
Merge branch 'master' into test
Merge branch 'master' into test
Merge branch 'master' into test
Merge branch 'master' into test
Merge branch 'master' into test
Merge branch 'master' into test
Merge branch 'master' into test