updates
Merge branch 'master' of github.com:5c077yP/lobgook

Conflicts:
	package.json