Readme, sort-of
Merge branch 'master' of github.com:danmichaelo/42

Conflicts:
	readme.md