User variable for server.js port number
Search Functionality Done
Merge branch 'develop' of http://github.com/charmae/dirtyEd into develop

Conflicts:
	server.js
Merge branch 'develop' of http://github.com/charmae/dirtyEd into develop

Conflicts:
	routes/users.js
Resolved conflicts on users.js