fixing merge conflict
Merge branch 'landing-page' of github.com:ninjamultimedia/ncstatepano into landing-page