gitignore
Merge branch 'master' of github.com:rbtkoz/octocycle
devise in routes
Merge conflict