Merge pull request #23 from Zappeion/master

merging master to jg_2 branch
Added GET routes for program
Added GET course routes
Baking in authentiation.
 Changes to be committed:
	modified:   package.json
	new file:   server/etc/passport.js
	modified:   server/server.js
	modified:   server/users/userModel.js
	modified:   server/users/userRoutes.js
User registration form. Needs to get wired to rest api.
 Changes to be committed:
	modified:   public/js/directives/login/login.html
	modified:   public/js/directives/login/login.js
	modified:   public/js/directives/nav/nav.html
	modified:   public/js/sos.js
	modified:   public/partials/header.html
	new file:   public/templates/signup.html
	modified:   server/courses/courseModel.js
	modified:   server/users/userModel.js
	modified:   server/users/userRoutes.js
Updated userModel,
Refactored all questions by user route to userRoutes,
Added get all market Posts, Conversations, and Favourites to userRoutes,
prototyped market and conversation routes/models,
Created basic routes for conversations
More fixing.
 Changes to be committed:
	modified:   package.json
	modified:   public/js/sos.js
	modified:   public/templates/signup.html
	modified:   server/users/userRoutes.js
Pushing users to server.
 Changes to be committed:
	modified:   public/js/sos.js
	modified:   public/templates/signup.html
	new file:   public/templates/success.html
	modified:   server/etc/passport.js
	modified:   server/server.js
	modified:   server/users/userModel.js
	modified:   server/users/userRoutes.js
updated new question routes and user model
Removed unused module from package.json and extra join line from server
prepping for merge with jg-2 branch
Merge remote-tracking branch 'remotes/origin/jg_2' into pv

Conflicts:
	package.json
	public/js/sos.js
	server/courses/courseModel.js
	server/server.js
	server/users/userModel.js
	server/users/userRoutes.js
Merge pull request #24 from Zappeion/pv

Merging Justins and pv branch to master.