ndomar/megasoft-13 — pull request #189 by kimoktm (2013-04-04 00:27:22+00:00)
Title: Fixed Conflicts

Rails is now working as expected