Answering questions
Merge branch 'master' of github.com:iest/pimp-my-ferret

Conflicts:
	build/bundle.js
	src/main.js