added height media queries
Merge branch 'flex-height2' of github.com:nprapps/elections14
modified media queries
Merge branch 'master' of github.com:nprapps/elections14