Update views.py
Update views.py
Update settings.py
Update views.py
Update models.py
Update forms.py
Update homepage.html
Update view_announcement.html
Update announcements.html
Update views.py
Update views.py
Update my_requests.css
Update requests.css
Update homepage.css
Merge branch 'master' into dev

Conflicts:
	managers/templates/announcements.html
Merge branch 'dev' of https://github.com/knagra/farnsworth into dev