Up to pages
working on fox-bramble script
Merge branch 'gh-pages'
working on fox-bramble script test 1
going to add media queries soon
going to add media queries soon
Oh yeah, i am pretty much finished
Merge branch 'master' into gh-pages

Conflicts:
	scripts/scripts.js
Fox and Bramble Over and Out