first commit
minor
First commit
Merge branch 'master' of github.com:crodas/corruptos.net

Conflicts:
	README.md