/frequency works in a preliminary way too
Merge pull request #6 from cooperjbrandon/master

merge
fixing a minor merge conflict
took me awhile to remember to start up postgres..
comment
Merge branch 'master' of https://github.com/noahcharris/Newspeak

Conflicts:
	server/routes.js