WIP
Merge branch 'master' of https://github.com/bosschaert/ece2013