nbozoglu/rails_projects — pull request #3 by lfalcon (2014-04-08 20:13:17+00:00)
Title: Feat/branch3

fixed the merge conflict on the file hehe