-Added scaffold for announcement
-Added scaffold for announcement
Changelog 17/05/14:
- Worked on "My Events" tab
Changelog 17/05/14:
- Worked on "My Events" tab
Changelog 17/05/14 2:
- "My Events" tab is done
- Changed the link in the "Browse" tab
Merge branch 'albertj' of https://github.com/taiyode/ClubBiz into albertj

Conflicts:
	ClubBiz/app/views/layouts/application.html.erb
Changlog 17/05/14 3:
- Modified the club index to only show the clubs that the current user is in, and the "edit" and "destroy" buttons are shown to admin only
Announcement implementation
Added implementation log
Merge branch 'anchen' of github.com:taiyode/ClubBiz into anchen

Conflicts:
	ClubBiz/app/assets/stylesheets/announcements.css.scss
	ClubBiz/app/controllers/announcements_controller.rb
	ClubBiz/app/models/announcement.rb
	ClubBiz/app/views/announcements/_form.html.erb
	ClubBiz/app/views/announcements/index.html.erb
	ClubBiz/app/views/announcements/new.html.erb
	ClubBiz/db/migrate/20140517045311_create_announcements.rb
Changelog 17/05/14 4:
- Modified show club
Merge pull request #5 from taiyode/sharsa

Sharsa
Merge branch 'albertj'
Merged index and show clubs
Conflicts:
	ClubBiz/app/views/clubs/index.html.erb
	ClubBiz/app/views/clubs/show.html.erb
Merge branch 'anchen'
Merged anchen with master
Conflicts:
	ClubBiz/app/views/clubs/show.html.erb
	ClubBiz/config/routes.rb