Merge pull request #37 from philelauria/master

Changed name on index.ejs from Shop 'N Save to Techno$ave
resolved some conflicts in parserFile