Initial gittification of Marvin.
Merge branch 'master' of github.com:marksantcroos/marvin

Conflicts:
	README.md