paris stuff and masseur stuff.
Merge branch 'master' of https://github.com/parismav87/air2014

Conflicts:
	acquisition_function.py