Merge pull request #75 from Codes-With-Eagles-SWE2014/ecgprc_sprint3

Ecgprc sprint3
troop factory insert troop working
removed old files
fixed merge conflict fixed
cleaned up repo