Kill pyc et dsStore
Merge branch 'master' of https://github.com/messinnicolas/pharma

Conflicts:
	.DS_Store
	venvPharma/lib/python2.7/distutils/__init__.pyc
Merge branch 'master' of https://github.com/messinnicolas/pharma
Pull request
Merge branch 'master' of https://github.com/messinnicolas/pharma

Conflicts:
	.DS_Store
	assets/.DS_Store