clean-up
recommit
Merge branch 'master' of https://github.com/MartijnSmit/iKnow