.
Merge branch 'master' of github.com:louisrigot/iat-alpha

Conflicts:
	.gitignore