ignoring exe & links
Merge branch 'master' of https://github.com/leon196/Trone

Conflicts:
	.gitignore