added timestamp functions
both master and local defined function 'cl' Merge branch 'master' of github.com:lancecaraccioli/BashPreferences

Conflicts:
	bash_preferences