gemfile conflict
darn gemfile
Merge branch 'master' of github.com:ashag/SeeMore
Merge branch 'master' of github.com:ashag/SeeMore
add db migrate