Done for the day, continue in the evening
			Merge branch 'master' of https://github.com/tokeloke/epitaBundle
Merge branch 'master' of https://github.com/tokeloke/epitaBundle