Add main navigation
Add active navigation

Fixes #6
Merge branch 'develop' into feature/navigation

Conflicts:
	source/layouts/layout.erb
Adjust grid to accomodate navigation
Merge branch 'feature/navigation' into develop