fixed typo
Merge pull request #6 from tiger-swallowtails-2014/activerecord_validations

fixed typo
fix merge conflicts
delete log files