add from OS X
add date from linux
Merge branch 'master' of localhost:~/util

Conflicts:
	README.md
add from Linux
Merge branch 'master' of localhost:~/util

Conflicts:
	README.md