.gitignore update
Merge branch 'master' of github.com:nesalang/compilation

Conflicts:
	.gitignore
	.gitignore~