Pull request for code challenge

Finished the code challenge, tests are not finished.