changed port nums back, turned polling back on
Merge branch 'master' of github.com:bikecomps/simulation
put in server address for long polling
Merge branch 'master' of github.com:bikecomps/simulation
Fixed Firefox display errors on clustering.html
Merge branch 'master' of github.com:bikecomps/simulation
Preliminary marker stuff
added in pairwise traffic data to summary stats; next, I need to add in more data about disaappointments: that table is still empty
fixed merge conflicts in bikeshare-custom.js
Hard-coded log2 regression values, also made an option to just use 2013's lambdas which seems to do better at Manhattan accuracy, also started regression with alt_poisson_logic but the dest_distrs are causing trouble
Merge branch 'master' of https://github.com/bikecomps/simulation
Color station icons based on capacity after running a simulation
Merge branch 'master' of github.com:bikecomps/simulation

Conflicts:
	views/app.py
	views/static/js/bikeshare-custom.js
button bar no longer draggable; map pans correctly with stats panel
fixed merge problems
Minor bug fix of station removal
Merge branch 'master' of github.com:bikecomps/simulation
making stuff display correctly
Merge branch 'master' of github.com:bikecomps/simulation

Conflicts:
	views/static/js/bikeshare-custom.js
colors work in Firefox now