ignore files
i don't remember what this commit is
Merge branch 'master' of github.com:/ITS-UofIowa/sitenow_theme_settings

Conflicts:
	.gitignore
actually resolve merge conflict