Separating logic out
Style updates
Merge branch 'master' of https://github.com/DonatoB/tofu

Conflicts:
	src/main.js
	src/tofu.user.js