config
Merge branch 'gh-pages' of https://github.com/haviet/static-on-foundation into gh-pages

Conflicts:
	_config.yml