conclusion (got skipped in previous commit)
Merge branch 'master' of https://github.com/r2d2bol/isvc2013