js demoted; python functions for counting points
merged master
ignore vim swp files