first commit
Merge branch 'master' of github.com:drda3x/bereco

Conflicts:
	index.html
	initial_data/circle_coordinates.csv
	initial_data/coming.csv
	initial_data/going.csv