up
Merge branch 'master' of https://github.com/itsmatthieu/samples

Conflicts:
	bacboneSample002/.idea/workspace.xml
	bacboneSample002/img/preview.png