cortana semicompleted
Merge branch 'cortanaBranch' of https://github.com/rohitgargwp7/cortanaRepo into hikeathon
semicomplete
Merge pull request #2 from rohitgargwp7/hikeathon

Hikeathon