define the structure
Merge branch 'master' of github.com:Franciscowxp/TheTime

Conflicts:
	.gitignore
	LICENSE
	README.md