Merge branch 'master' into develop
Tweaked display
Merge branch 'develop'
Merge branch 'master' into develop
updating icon font, styling pagination, etc.
completed merge
Added tumblers
Merge branch 'develop' of github.com:Norex/norex-blog into develop
Merge branch 'develop'
Fix tags