added a pages bit that won't work
Merge branch 'master' of https://github.com/classam/argyle

Conflicts:
	gulpfile.js