commented out rails version
fixed support for rails 4
conflict
merge
upped version
rvmrc
gem lock