Merge gist.github.com:/7747214

add in homework from github