background
Merge branch 'master' of https://github.com/souvir/projet-mobile

Conflicts:
	chopacho/ViewController.m