changed something
Merge branch 'master' of https://github.com/pviolette3/freedom-of-speech

Conflicts:
	package.json
Merge branch 'master' of https://github.com/pviolette3/freedom-of-speech
Changed the deploy so that sudo is no longer required. now run with
./deploy -k to keep alive.