Third commit

This is a third commit
Merge branch 'Testing-and-design'