reset
Merge branch 'master' of github.com:zebheone/GhostScroll

Conflicts:
	README.md
	index.hbs
	post.hbs