first commit
Initial Upload of Server files to test how github works.
Just a test
Initial Commit
Initial commit
I just added some words.
Merge branch 'master' of https://github.com/cyanogen32/udasher
help me
Added document with random text and stuff
Merge branch 'master' of https://github.com/BradleyMayo/Node-Practice
Functional Sessions
Merge branch 'master' of https://github.com/BradleyMayo/Node-Practice
Updated Comments on sessins files
Added views and css
Merge branch 'master' of https://github.com/BradleyMayo/Node-Practice

Conflicts:
	session_testing/app.js
	session_testing/app.js~
	session_testing/database.js
	session_testing/database.js~
	session_testing/routes/index.js
	session_testing/routes/index.js~
Merge branch 'master' of https://github.com/cyanogen32/udasher
new views
added more views
Merge branch 'front_end' of https://github.com/BradleyMayo/udasher

Conflicts:
	app.js
	database.js
	node_modules/ejs/package.json
	node_modules/express/node_modules/buffer-crc32/package.json
	node_modules/express/node_modules/commander/package.json
	node_modules/express/node_modules/connect/node_modules/formidable/package.json
	node_modules/express/node_modules/connect/node_modules/qs/package.json
	node_modules/express/node_modules/connect/package.json
	node_modules/express/node_modules/cookie/package.json
	node_modules/express/node_modules/debug/package.json
	node_modules/express/node_modules/methods/package.json
	node_modules/express/node_modules/mkdirp/package.json
	node_modules/express/node_modules/send/node_modules/mime/package.json
	node_modules/express/package.json
	objects/profile.js
	objects/trip.js
	objects/trip.js~
	public/stylesheets/style.css
	routes/index.js
	views/index.ejs
	views/user.ejs
Updated Sessions with databasing through mongojs