trying to make heroku happy
still trying to fix heroku
trying to get db in
Annoying fuck
updated gemfile
added gemfile lock
Fuckign gemfile
Merge branch 'master' of github.com:Jazzychen/eecs-dashboard
Merge complete