form building
Merge branch 'master' into farm-form
commits
Merge branch 'master' into farm-form
finished forms, started testing
testing
minor alterations
testing issues.
finished testing the farm form
testing of editfarmform
finished testing
cleaned up view code
pull request changes and testing
test changes
tests completed
Merge pull request #31 from Cheekio/farm-form

Farm form
Merge branch 'master' into template-form

Conflicts:
	announce/tests.py
	static/initializr/css/main.css