Merged changes from Natethegreatt repo
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app.js
	controllers/router.js
	package.json
Merge pull request #8 from ethesx/master

Updated many files...  (second pull attempt)
super merge
deleted backup files from mergetool
Semicolons missing.
Moved controller statements to ./routes.js from controllers/router.js
Set path for requests controller.
Added missing semicolon.
Deleted old router.js file. ./routes.js used instead
Merge pull request #17 from ethesx/master

Moved code to ./routes.js
deleted css duplicates
deleted routes.js?
deleted unused models, cleaned up routes.js
Update login.jade
Update login.jade

sun morn
package.json
jade commit 3
Merge pull request #20 from streco/master

This is the latest version of login.