resolved some conflicts in parserFile
changed object value on line 7 to Techno
changed line 26 to reflect new project name Techno
press release updated. routes/index updated to reflect new company/ project name. views/index updated to reflect new company name. conflicts in parserfile resolved
Merge branch 'master' of https://github.com/philelauria/TechnoSave
conflict in routes resolved
fixed syntax error
Merge pull request #45 from philelauria/master

index.js conflict resolved