made changes to the index.html as well as all the .css files
removed some autogenerated git conflict code
made some more aesthetic changes
Branch for Gallery

lalala, with demo pictures. Will be updated with all IEEE pictures soon
Merge branch 'refs/heads/gallery' into lastSprint
Changed images for the carousel, font fixed, margin fixed
Merge branch 'lastSprint' of github.com:IEEE-Website-2013-UBC/IEEEWEBSITE2013 into lastSprint
fixed a css bug in general.css
Added some content
Added some more content

Some teams remmaining that need a description though
Gallery Update

- fixes hyperlink colour
- fixes scrolling to the top of the page on opening an album
- fixes problem involving arrow keys moving both the lightbox and liquid
slider.
***REMOVED arrow key navigation with liquid slider***
[Gallery/About] Liquid Slider Fix

- reverts About page LS to auto-height with arrow key navigation
- added custom js file for gallery page, without auto-height and without
arrow key navigation
[General] Deleted Extra folder
[Gallery] Working Copy

- width 75%, LS adjusts to this
- added date to albums
- removed redundant year title on albums
- fixed error where albums wouldn't close when switching years
- Editing actual IEEE Photos now
Removed white line, make accorditon to have sliding function
Merge branch 'lastSprint' of github.com:IEEE-Website-2013-UBC/IEEEWEBSITE2013 into lastSprint
updated teams page
Added some more content again
Update About_UBC_IEEE.html
added info to the about page