Init Alloy commit
Merge branch 'master' of github.com:ccavazos/hack-until-it-hertz

Conflicts:
	.gitignore