Preliminary marker stuff
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