Merge pull request #1 from shawnsandy/develop

Develop - Maser V0.1
Merge pull request #2 from shawnsandy/develop-core

Develop core
Merge pull request #3 from shawnsandy/develop

Added favicon
Merge pull request #4 from shawnsandy/develop-core

updated
Merge pull request #5 from shawnsandy/develop

Twig template blocks added
module
Merge branch 'master' of https://github.com/shawnsandy/base-start
nav-menu removed nav class from top bar
Merge branch 'master' into develop

Conflicts:
	index.html