version 1.0 uploaded
Merge branch 'master' of https://github.com/marcopasi/cnrs2014-website

Conflicts:
	css/marcopasi.css

merged