Corrected problems with setup
More into .gitignore
Merge branch 'master' of github.com:thedavecollins/ExEmGel

Conflicts:
	.gitignore