Finally got my award/requirements stuff
Merge branch 'master' of https://github.com/jorapi/lamers-project.git