Merge branch 'master' of https://github.com/jschaedl/ilegs

Conflicts:
	.gitignore
Merged .gitignore