skeleton
Merge branch 'master' of https://github.com/IEEE-Website-2013-UBC/IEEEWEBSITE2013