Initial commit
Merge branch 'master' of https://github.com/lucasmcarp/Sitio

Conflicts:
	README.md