Develop

Finishing sprint 1