first commit
merging .gitignore

Merge branch 'master' of https://github.com/danfreak/EM

Conflicts:
	.gitignore