Updated gitignore
Merge branch 'master' of https://github.com/FiftyTwo/EdgeLibrary

Conflicts:
	.gitignore