Finishing touches
Merge branch 'master' of https://github.com/Seemples/stefanHackathon