Merge pull request #5 from abhijitnukalapati/temp

Temp
adding primary map screen
Merge branch 'master' of https://github.com/abhijitnukalapati/jetsons2014
Merge pull request #6 from BradMoeller/master

adding primary map screen
Merge remote-tracking branch 'origin/master' into temp