added ignore in .gitignore
Merge branch 'master' of https://github.com/samsonoris/ep

Conflicts:
	.gitignore