starting
Merge branch 'master' of https://github.com/garviand/GlobalHackWashU2014 into adam

just updating
Neighbors has stopped working, will start working on filters instead
Can trace neighbor paths
CSS Range Bar Edit
Merge Neighbor