Upgraded to rails 3.1
Setting up for asset pipeline
Upgraded but broke a lot of the hard coded assets
Moved all the assets
Git rm stupid git keep
static/home asset fix
no more status… for now
Fixed the conflict
stylesheet asset fixes for rails 3.1
Merge branch 'rails31' of https://github.com/ACMCMU/scheduleplus into rails31
Non working 3.2
move lib js into lib/*; fix calendar.js dupe; disable dev caching
All the necessary testing gems
Revert "Merge branch 'foreveralone' of heroku.com:acm-schedule"

This reverts commit baa4d872b7f736ca7d1107dbb96f9f0c748d02c1, reversing
changes made to fb6e0a900b7c6b0ca5beedb05fb0c522073899eb.

Conflicts:

	Gemfile
	Gemfile.lock
	app/models/user.rb
	config/environments/production.rb
Guard and basic rspec scaffolding
Revert "Merge branch 'foreveralone' of heroku.com:acm-schedule"

This reverts commit baa4d872b7f736ca7d1107dbb96f9f0c748d02c1, reversing
changes made to fb6e0a900b7c6b0ca5beedb05fb0c522073899eb.

Conflicts:

	Gemfile
	Gemfile.lock
	app/models/user.rb
	config/environments/production.rb

Conflicts:

	Gemfile.lock
Fixed Gemfile.lock
Basic testing framework and merge conflict
Fixed omniauth
merge conflicts fixed in Gemfile