fixed merge conflict
Merge pull request #27 from Codes-With-Eagles-SWE2014/ecgprc_sprint3

fixed merge conflict