Change formatting. Final for demo
Merge pull request #17 from Cfeusier/CF_demo_branch

Change formatting. Final for demo