small typo fix
Merge branch 'master' into mcarthur
Merge branch 'master' into mcarthur
made show page
made question#index view
merge nao
removed index.html