karan/Projects-Solutions — pull request #245 by melvin0008 (2014-12-28 08:55:14+00:00)
Title: Merged Conflicts

I'm not sure whether what I did is correct or not