changed server so postgress works with my comp. collocation chart resizes
click through d3 event
in process of updating nodes for extra words
progress on node chart - may need to restart
completely scraped collocation chart and started over .collapsible node chart with ticks now working properly.
added treeConvert factory to convert array into object and insert into tree. .then (promise) needs to be fixed
collocation node graph fully functioning.
collocation chart works for drag events. directive.js appends svg to directive, not body
added nvd3 for frequency chart. added navbar
deleted individual chart templates and combined into one template
finished basic navbar. added logo
d3 website not working so added d3.min.js; combined teststyle.css and style.css; both charts line up
changed width's on charts. set up two columns for display
president list is filterable, hoverable, and clickable that flows through to scope
add factory to format frequency data, returns to controller which flows through to frequency chart
moved factories into one folder. show axis labesl for line graph. clicking on a circle in the node graph translattes to the line graph as well
changed postgress route name for pull request
Merge branch 'master' of https://github.com/noahcharris/Newspeak

Conflicts:
	server/routes.js
Merge pull request #7 from cooperjbrandon/master

post winter break pull request