Merge pull request #2 from rohitgargwp7/hikeathon

Hikeathon
Merge pull request #3 from rohitgargwp7/hikeathon

adding files
UX flow and UI changes
Merge pull request #4 from rohitgargwp7/Cortana_Hikathon

UX flow and UI changes
pulled the latest code