rebasing with Couillard's stuff in master
Adding some .svgs and trying in vain to fix the timeline
merging timriot