Derpy link
Merge branch 'master' of https://github.com/ClaremontAcademia/Forum

Conflicts:
	forum/templates/announcement.html