including public/js stuff
idunno
Merge branch 'master' of https://github.com/buffaloopendata/grs

Conflicts:
	.gitignore
ignore swp file
Merge branch 'master' of https://github.com/buffaloopendata/grs
./
added db files and dev scripts