Added ruby version to Gemfile
Added boilerplate code
Merge branch 'master' of https://github.com/upfrontwichita/upfrontwichita.com
Add modernizr and bootstrap
Fixed ruby version in Gemfile
Getting changes
Merge branch 'master' of https://github.com/upfrontwichita/upfrontwichita.com
Adding generated bootstrap files
Added google web fonts.  Oswald for <headings> and Open Sans for body.
Adding default styles, getting a Compass error
Fixed compass issue, added to Gem file.
Initial working version of Twitter auth
Font families are tied in. Using heading tags (<h1>) or classes (.h1) will invoke the Oswald font.  Everything else is set for Open Sans.
Making sure we don't commit compiled assets
Whitespace cleanup
Login support for Github
Moving 3rd party assets to vendor
Updated to use UpFront Twitter application
Make production precompile modernizr.js
Merge branch 'master' of git://github.com/MattConrad/upfrontwichita.com into MattConrad-master

Conflicts:
	config/routes.rb
Adding Google Auth2 authorization