Merge branch 'feature/footer_ourgoals' into develop
Merge pull request #120

Conflicts:
	locale/en/LC_MESSAGES/django.mo
	locale/en/LC_MESSAGES/django.po
	locale/es/LC_MESSAGES/django.mo
	locale/es/LC_MESSAGES/django.po
	static/webapp/css/starter-template.css
	templates/webapp/base.html
	webapp/urls.py
	webapp/views.py