kk
Merge branch 'master' of https://github.com/IUT-Blagnac/MPA2014G2A1

Conflicts:
	.travis.yml