test
Merge branch 'master' of https://github.com/pungme/toilet

Conflicts:
	app.js