Merge remote-tracking branch 'origin/patch-1'

Conflicts:
	README.md
Merge remote-tracking branch 'parent/master'

Conflicts:
	README.md
Added time command
Added readme
merging stuff
Merge pull request #66 from JOPHESTUS/master

Added time command