Merge pull request #1 from NewSIS/master

update my repo now!
create CRUD scaffolding for user model

and fixed some formatting stuff.
create make file and mocha tests for userModel
Merge pull request #8 from IanSchweer/master

Courses and tests models setup
additional testing instrumentation and socket scaffolding
Merge branch 'master' of git://github.com/NewSIS/BaSIS into NewSIS-Master

* 'master' of git://github.com/NewSIS/BaSIS:
  CRUD (crumDs) Scaffoldding for tests
  Setup view integration with courses code
  Readjusted code to fit new models setup. Commit includes setup of courses db, controller, view

Conflicts:
	public/js/controllers.js
	routes/socket.js
	views/partials/list.jade
fixed merge conflicts
forgot some mergin'
Merge pull request #10 from ChrisMcKenzie/master

Added test directory for mocha tests as well as a make file for running mocha in npm test