- club office holder implementation
.generated office_holder_position scaffold
.added associative relationships between it and user and clubs
.modified views to show particular positions depending on clubs
.modified club controller to create president office holder upon creation
.added validation so that users can't have two office holder positions in one club
- admin view implementation
.created admin view
.created method in club controller to remove admin
.created method in club controller to add admin
.added routes for admin
- event ticket implementation
.created ticket scaffold
.added associative relationships between ticket and users and events
.modified event index and form
(need to add end time for event or duration)done
(add ticket sold from date)done
(need to add discussion forum for event)done
.updated event form and event controller
- event ticket implementation
.created ticket scaffold
.added associative relationships between ticket and users and events
.modified event index and form
(need to add end time for event or duration)done
(add ticket sold from date)done
(need to add discussion forum for event)done
.updated event form and event controller
.ticket methods, index, delete, update
Changelog 21/05/14:
- Modified the Club Page to have 6 menus (Announcements, Events, Admins, Discussion Forum, Join Us, and Contact Us)
- Created the Browse Event
- Modified the Event Page to have banner image at the top, and images on the left side and Event Details on the right side
- Working on the reserve tickets
- Modified the Navigation Bar for "My Clubs" to list three clubs only and add "More..." if there are more clubs that the user is in
Merge pull request #8 from taiyode/anchen

Implemented tickets and office holders
Merge branch 'albertj'
Resolved all conflicts.

Conflicts:
	ClubBiz/app/controllers/events_controller.rb
	ClubBiz/app/views/clubs/show.html.erb
	ClubBiz/app/views/events/index.html.erb
	ClubBiz/app/views/events/show.html.erb
	ClubBiz/config/routes.rb
Added seed for a user and a club