gitignore
Merge branch 'master' of https://github.com/misdake/Anergine

Conflicts:
	.gitignore