Make opening/closing times work
Merge branch 'master' of github.com:ackien/friendly

Conflicts:
	README.md

Merging README