Merge branch 'master' of /home/mruskov/work/PycharmProjects/sprks-sync with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/index.html
minor changes in simulation