navbar in app
Merge branch 'master' of https://github.com/mrdirtbag/nbc_hackathon_2014
added internal navbar and settings view
added second video
Merge branch 'master' of https://github.com/mrdirtbag/nbc_hackathon_2014
made settings an overlay layer
Merge branch 'master' of https://github.com/mrdirtbag/nbc_hackathon_2014