Updated to use cloud db, can post questions to db using /question, however need to create other documents for users, categories, etc.
	modified:   app/api.js
	modified:   app/config/database.js
	modified:   app/models/question.js
	modified:   server.js
Structured repo, removed necessary files, simplifying server
 Changes to be committed:
	new file:   app/config.js
	deleted:    app/config/database.js
	new file:   app/models/course.js
	new file:   app/models/question.js
	modified:   app/models/user.js
	renamed:    app/config/passport.js -> app/old/config/passport.js
	renamed:    app/routes.js -> app/old/routes.js
	renamed:    app/models/user.js -> app/old/user.js
	new file:   app/public/index.html
	new file:   app/public/js/sos.js
	new file:   app/server.js
	new file:   bower.json
	modified:   package.json
	deleted:    public/404.html
	deleted:    public/_models/user.js
	deleted:    public/app.js
	deleted:    public/controllers/main.js
	deleted:    public/controllers/newpost.js
	deleted:    public/controllers/repeatPassword.js
	deleted:    public/controllers/signup.js
	deleted:    public/favicon.ico
	deleted:    public/images/Archive.png
	deleted:    public/images/Logout.png
	deleted:    public/images/Market.png
	deleted:    public/images/MyPosts.png
	deleted:    public/images/Pen.png
	deleted:    public/images/PrivateMessages.png
	deleted:    public/images/PublicBoard.png
	deleted:    public/images/Response.png
	deleted:    public/images/Response2.png
	deleted:    public/images/Timeline.png
	deleted:    public/images/UserImg.png
	deleted:    public/images/backgroundimg.png
	deleted:    public/images/flag-report.png
	deleted:    public/images/logo.png
	deleted:    public/images/settings.png
	deleted:    public/index.html
	deleted:    public/javascripts/bootstrap.js
	deleted:    public/javascripts/bootstrap.min.js
	deleted:    public/javascripts/jquery-1.11.1.js
	deleted:    public/javascripts/jquery.mCustomScrollbar.concat.min.js
	deleted:    public/js/core.js
	deleted:    public/stylesheets/SOSCss-Registration.css
	deleted:    public/stylesheets/SOSCss.css
	deleted:    public/stylesheets/bootstrap-theme.css
	deleted:    public/stylesheets/bootstrap.css
	deleted:    public/stylesheets/style.css
	deleted:    public/util/hash.js
	deleted:    public/vendor/angular-messages.js
	deleted:    public/vendor/angular-resource.js
	deleted:    public/vendor/angular-route.js
	deleted:    public/vendor/angular.js
	deleted:    public/views/home.html
	deleted:    public/views/login.html
	deleted:    public/views/newpost.html
	deleted:    public/views/register.html
	deleted:    public/views/test.html
	deleted:    public/views/timeline.html
	deleted:    public/views/z_signup.html
	deleted:    server.js
	deleted:    views/index.ejs
	deleted:    views/login.ejs
	deleted:    views/oldsignup.ejs
	deleted:    views/profile.ejs
	deleted:    views/signup.ejs
Updated instructions
	modified:   README.md
	modified:   app/config.js
Updated Schemas, and fixed some bugs in earlier version of them.
 Changes to be committed:
	modified:   app/api.js
	deleted:    app/config.js
	modified:   app/models/course.js
	new file:   app/models/helpers.js
	modified:   app/models/question.js
	modified:   app/models/user.js
	modified:   app/public/index.html
	modified:   app/public/js/sos.js
	modified:   app/server.js
Added template for database connections so we don't start saving our passwords on github.
	modified:   README.md
	new file:   app/config.js
	new file:   app/etc/database.json
Broken, restructuring
Fixed loading database url, questions routes mocked
	modified:   server/config.js
	modified:   server/questions/questionRoutes.js
	modified:   server/server.js
Added express validator.
	modified:   bower.json
	modified:   package.json
	modified:   public/index.html
	modified:   server/questions/questionRoutes.js
	modified:   server/server.js
Merge branch 'pv' of github.com:Zappeion/athens into pv

Conflicts:
	app/api.js
	app/config/database.js
	server.js
Posts/returns from server, bumping to get Ken's work in.
 Changes to be committed:
	deleted:    app/models/answer.js
	deleted:    app/models/course.js
	deleted:    app/models/program.js
	deleted:    app/models/question.js
	modified:   bower.json
	modified:   public/index.html
	modified:   public/js/sos.js
	modified:   server/questions/questionRoutes.js
Starting to merge in Ken's changes
 Changes to be committed:
	modified:   bower.json
	new file:   public/js/directives/nav/nav.html
	new file:   public/js/directives/nav/nav.js
	renamed:    public/js/sos.js -> public/js/questionTest.js
	modified:   public/js/sos.js
	new file:   public/templates/questions.html
	renamed:    public/index.html -> public/test_question.html
Brought in menu, set-up basic angular app framework, some sample routes.
 Changes to be committed:
	modified:   bower.json
	new file:   public/css/dashboard.css
	new file:   public/index.html
	new file:   public/js/directives/login/login.html
	new file:   public/js/directives/login/login.js
	modified:   public/js/directives/nav/nav.html
	modified:   public/js/sos.js
	new file:   public/partials/header.html
	new file:   public/templates/login.html
	modified:   public/templates/questions.html
	modified:   server/etc/database.json
GET, GET by id, and POSt working for Question
Moved user model and routes
Added GET, POST user
Added Get all questions by user id
Updated server for user routes
Removed legacy models question & user
Commented duplicate server path var
Merge branch 'master' into ken-merge

Conflicts:
	README.md
	app/api.js
	app/config/database.js
	app/models/answer.js
	app/models/course.js
	app/models/program.js
	app/models/question.js
	app/models/user.js
	app/routes.js
Merge branch 'ken-merge'