Working on second set of dots
enter and translate for greeneys (generators of data)
Formatting
Hack hack hack, hack hack hack
Merge branch 'master' of github.com:JoshuaDickerson/hackvt-2014

Conflicts:
	js/view2.js