fix some bugs in dataPrepration script
Updated website.md for deploying for testing without using Apache
Merge branch 'master' of github.com:sfu-natlang/lensingwikipedia
Replace all double quotes with single quotes for HTML strings.

This is so we don't have \" all over the place making everything unreadable.
Replace double quotes with single in index.html
Merge pull request #116 from sfu-natlang/frontendPython

Updated website.md for deploying for testing without using Apache
Merge pull request #117 from sfu-natlang/double-to-singlequotes

Double to singlequotes
Merge branch 'master' into smoothed-timeline

Conflicts:
	frontend/timeline.js