added conditional to front-page question
Merge branch 'gh-pages'