Trying to connect django to js
doing stuff

Merge branch 'master' of https://github.com/polpolion/TheFatalisticGameOfLife

Conflicts:
	python/TFGOL/tfgol_web/views.py