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