fixes
Merge branch 'master' of github.com:aletty/shwastinator

Conflicts:
	pinky/app.js
merge fix