to merge parser with master
Merge branch 'master' of https://github.com/noahcharris/Newspeak into parser
setting up angular: add controller, template folder, SOTU factory, update index.html, making directives for D3
set up server with router
Merge branch 'master' of https://github.com/noahcharris/Newspeak into parser

Conflicts:
	server/request-handler.js
Merge pull request #2 from cooperjbrandon/parser

server4u
d3 works with angular
Merge branch 'master' of htt rebase tps://github.com/noahcharris/Newspeak into parser
d3 works with angular
deleted server
Merge pull request #3 from cooperjbrandon/master

d3 works with angular
interactive d3 with automatic rerending and links to the scope
Merge branch 'master' of https://github.com/noahcharris/Newspeak
Merge pull request #4 from cooperjbrandon/master

start off day all on same page
adding node_modules with pg and express
Rewriting server using express.
Made a basic connection to postgres database
moved server to tempserver to make room for express. set d3 into it's own factory for the directive. removed client/chart.js
removed not needed folders/ files (server files moved to tempserver; chart replaced with d3chart)
Practicing with postgres
minor