committing because i have to
merge conflict resolved
Merge branch 'master' of https://github.com/johnshaughnessy/onesec_rails
Merge branch 'master' of https://github.com/johnshaughnessy/onesec_rails
committing because schema changed
Merge branch 'master' of https://github.com/johnshaughnessy/onesec_rails
Merge branch 'master' of https://github.com/johnshaughnessy/onesec_rails
Merge branch 'master' of https://github.com/johnshaughnessy/onesec_rails
Merge branch 'master' of https://github.com/johnshaughnessy/onesec_rails
Merge branch 'master' of https://github.com/johnshaughnessy/onesec_rails
Merge branch 'master' of https://github.com/johnshaughnessy/onesec_rails
Merge branch 'master' of https://github.com/johnshaughnessy/onesec_rails
Merge branch 'master' of https://github.com/johnshaughnessy/onesec_rails
Merge branch 'master' of https://github.com/johnshaughnessy/onesec_rails
Merge branch 'master' of https://github.com/johnshaughnessy/onesec_rails
Merge branch 'master' of https://github.com/johnshaughnessy/onesec_rails
Merge branch 'master' of https://github.com/johnshaughnessy/onesec_rails
Merge branch 'master' of https://github.com/johnshaughnessy/onesec_rails
gemfile.lock
Merge branch 'master' of https://github.com/johnshaughnessy/onesec_rails