updating gitignore
Merge branch 'test' of github.com:ITS-UofIowa/uc.uiowa.edu into test

Conflicts:
	.gitignore
Merge branch 'refs/heads/master' into test

Conflicts:
	.gitignore
updating gitignore
Merge branch 'prod' of github.com:ITS-UofIowa/uc.uiowa.edu into prod

Conflicts:
	.gitignore
Merge branch 'refs/heads/master' into test
Merge branch 'refs/heads/test' into prod

Conflicts:
	.gitignore
updated git ignore
Merge branch 'refs/heads/master' into test
Merge branch 'refs/heads/test' into prod
updating subtheme to use parallaxy base theme
Revert "updating subtheme to use parallaxy base theme"

This reverts commit 46103455de09f1d01f7f922c7aa1adb32e8556c8.