finishing template
template form work
issues with null value error
finished new template form
changes to template
testing
finished up testing
Merge branch 'master' into template-form

Conflicts:
	announce/tests.py
	static/initializr/css/main.css
tested
getting tests to work
yo
Merge branch 'master' into template-form
commit
start of completion
change from kwarg
change from kwarg
final change
testing
testing
Merge branch 'master' into template-form

Conflicts:
	announce/tests.py
	announce/views.py
	farms/tests.py