v0.1
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	_config.yml
Merge pull request #1 from cxhernandez/master

v0.1