Add Gemfile.lock into .gitignore
Merge branch 'rails3'
Update .gitignore
Bundle update
Merge branch 'rails3'
Update production.rb
Create an Api NotFound action
Clean code
Update TODO.md
Merge branch 'rails3' of https://github.com/ApiBootstraper/Rails-server into rails3
Remove kaminari and add meta_search
Add new pagination strategy
Update models Todo and User
Update rspec for users_controller
Use Travis
Merge branch 'rails3'
Update .travis.yml
Merge branch 'rails3'