Saving to github, my machine is getting corrupt
Setup for Mid-Term Demo
Removing the hardcoded urls in views
Merge pull request #2 from dushyant89/master

Merging develop and master branch