Announcement divs
Merge branch 'olivia'

Conflicts:
	index.php
	style.css