change announcement html
Update index.html.erb
Update index.html.erb
Update index.html.erb
Update index.html.erb
Update index.html.erb
Update index.html.erb
Update index.html.erb
Update index.html.erb
Update index.html.erb
Update index.html.erb
Update index.html.erb
Update index.html.erb
Merge branch 'master' into dev_jason

Conflicts:
	app/assets/stylesheets/application.css.scss