integrated the menubar and added a google calendar widget
made some changes
Added carousel's caption
Merge pull request #4 from IEEE-Website-2013-UBC/calendar

Calendar
Merge pull request #5 from IEEE-Website-2013-UBC/slider

Added carousel's caption
Mannually merged calendar with slider in index.html
fixed the bug, and changed the circles to rectangles
added a div between the navbar and the carousel
Set area for calendar
Merge branch 'homepage' of github.com:IEEE-Website-2013-UBC/IEEEWEBSITE2013 into homepage
added the skeleton for the accordion
Moved calendar to the right column
changed some styles
changed some styles2
added about IEEE page that can navigate page back
Merge branch 'homepage' of https://github.com/IEEE-Website-2013-UBC/IEEEWEBSITE2013 into homepage
fixing conflicts
Merge pull request #6 from IEEE-Website-2013-UBC/accordion

Accordion
added different pages
solved the merge conflicts or the things