Merge pull request #23 from ethesx/master

Added basic persistence for data common to all requests
fixes and merge
Merge branch 'master' of https://github.com/NateTheGreatt/is421-calc
organization & small front end fixes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	routes.js