Conflict resolution
Merge branch 'ifjorissen-ifj_landing'
fix search to search text in html, not data
squash
Merge branch 'master' of https://github.com/GraphAlchemist/alchemy
More robust styling example
graph styling example
Merge pull request #196 from MDCox/stylingExample

More robust styling example
Merge branch 'master' of https://github.com/GraphAlchemist/Alchemy into ifj_landing