bug fixes
Merge branch 'master' of github.com:pdiemert/sally

Conflicts:
	package.json