-Added scaffold for announcement
-Added scaffold for announcement
Changelog 17/05/14
Moved join button to the club main page
Added basic browse page for events and clubs
Changelog 17/05/14 3
- Added category to Clubs
Announcement implementation
Added implementation log
Changelog 17/05/14 3
Added browsing clubs by category
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
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