Final Commit

This was a very hard homework