Removing sqlite explorer journal file
Merge branch 'devise-cancan' of github.com:jaredhoyt/rails-sample into devise-cancan
Updating schema