Homework and other stuff
Merge pull request #64 from apklock/master

Homework for session 5 plus session 3 and 4 stuff