Added dataRequest factory
Added dataRequest routes to server
Added dataRequest basic parsing and query structure
Modified MySQL config
Commiting only to merge with upstream branch server2
Commiting only to merge with upstream branch server2
Refactored datarequests. Currently running on localhost.
Merge branch 'master' of https://github.com/Campaign-Data-Visualization/campaign-cents
commiting before merging with upstream master
Merge branch 'master' of https://github.com/Campaign-Data-Visualization/campaign-cents

Conflicts:
	client/styles/css/app.css
mergered css
Merge branch 'server2' of https://github.com/Campaign-Data-Visualization/campaign-cents
added "mysql" package to the dependencies
Updated app.js to have the correct router name
Merge branch 'master' of https://github.com/hackystack/campaign-cents

Conflicts:
	server/dataRequest/dataRequest_model.js
	server/dataRequestCatcher/dataRequest_model.js
	server/main/app.js
	server/note/note_model.js
Commented out DB connection to push to deployment
Updated package.json to include server.js as main
added in and saved morgan npm module in package.json
updated package.json so body parser is in the product depencencies
added ui router to npm depenencies in package.json
included client lib
added in db connection
Added in DB connection line