modded gemfile.lock
Merge branch 'master' of https://github.com/gopher-snakes-2013/dim_sum_msg_board

merge
Merge branch 'master' of https://github.com/gopher-snakes-2013/dim_sum_msg_board

pulling master to local
Merge branch 'master' of https://github.com/gopher-snakes-2013/dim_sum_msg_board

git er done
fixed migration
fixed migrations