Refactor
Merge branch 'master' of github.com:zemm/herp-derp-fi

Conflicts:
	herpderpify.js