Merge pull request #11 from benlk/master

2013 Report
added Gemfile.lock
added foundation with Sass for easier and cleaner overrides
Merge pull request #12 from tarebyte/master

Added Sass overrides
Merge branch 'master' of github.com:OSUOSC/hackathon-website into frontpage

Conflicts:
	source/layouts/layout.erb