minor bug
minor changes
Merge branch 'development'

Conflicts:
	assets/css/main.css
	templates/base.html
Merge branch 'development'
ready for heroku
ready for heroku
google recaptcha
Merge branch 'development'
changed requirements
changed requirements
changed requirements
changed requirements
changed requirements
changed requirements
changed requirements
changed requirements
changed requirements
changed requirements
import errors
import errors