removed files ending with a tilde(~)
Merge branch 'p1' into prototyping