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