ignore *.exe
Merge branch 'master' of https://github.com/x1o/informatix.git

Conflicts:
	.gitignore
ignore *.swp