Starting work on settings section
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Updating README
Updating README
merging conflicts
Introducing site settings
Merge branch 'dev' of https://github.com/GlavinCMS/glav.in into dev
Merge branch 'settings' into dev