Merge branch 'master' of /home/tsgriggs2/IdeaProjects/Frizza with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Frizza/views.py
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
hoping that the pattern tag works for the text boxes