week3, 4 first done
Merge branch 'master' of github.com:annisall/ror