rails 12
Merge pull request #76 from russelltaff/test

rails 12