Fixing files
Merge branch 'master' of https://github.com/thejamesdempsey/cru-baseplate

Conflicts:
	.gitmodules
	dev/styles/screen.scss
Issues fix