some changes
Merge branch 'master' of github.com:pmanko/sleep.tools

Conflicts:
	R/playground.R