Set area for calendar
Merge branch 'homepage' of github.com:IEEE-Website-2013-UBC/IEEEWEBSITE2013 into homepage
Moved calendar to the right column
changed some styles
changed some styles2
fixing conflicts