Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte into develop
Update .gitignore
Update rails version