pushing
Merge conflicts
Merge branch 'development' of https://github.com/genevievebelle/Scrawler-UI into development
fixed minor merge conflict in index.html