added maps and fixing layout
added maps and fixed layout
adding sass cache
sass-cache whyy
Merge branch 'master' into gh-pages

Conflicts:
	.sass-cache/8d4b594031384cdf62572b49e3bb96ec7fcf11d1/style.scssc
Merge branch 'master' into gh-pages
tMerge branch 'master' into gh-pages

Conflicts:
	.sass-cache/8d4b594031384cdf62572b49e3bb96ec7fcf11d1/_variables.scssc
	.sass-cache/8d4b594031384cdf62572b49e3bb96ec7fcf11d1/foundation.scssc
	.sass-cache/8d4b594031384cdf62572b49e3bb96ec7fcf11d1/style.scssc
Merge branch 'master' into gh-pages

Conflicts:
	.sass-cache/8d4b594031384cdf62572b49e3bb96ec7fcf11d1/_variables.scssc
	.sass-cache/8d4b594031384cdf62572b49e3bb96ec7fcf11d1/style.scssc
Merge branch 'master' into gh-pages
removed sass cache
Merge branch 'master' into gh-pages
removed sass cache
Merge branch 'master' into gh-pages

Conflicts:
	.sass-cache/666f296db6ff64976716f365bc1a90d6f6cc9be2/style.scssc
Merge branch 'master' into gh-pages
added new pages and nav