remove link, add hogan
Merge branch 'master' of https://github.com/yezhiming/butterfly

Conflicts:
	bower.json