EPFL Master

I am not in master yet, stay tuned!