master
remove sqlite3 gem
[bundle update gem]
first commit
fix conflicts file