Add edit button

* add edit button to announcements on admins dashboard
Merge javascript and css assets
Merge conflict resolution

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css.scss
Merge pull request #19 from aphuong/announcements

Announcements