Finished homework4
Merge pull request #55 from luxury1/master

Finished homework4
finished homework 2

uh not sure if this works but I tried ok
Merge pull request #57 from domagalski/master

Finished homework 2