gitignore
Merge branch 'master' of github.com:1bourb/julia

Conflicts:
	.gitignore