Finished episode 13
Fixed merge issues