Profile picture changing
Merge branch 'master' into tweak
created new improvedChat branch from master

re-enables login
Fixed null FB and Google users and more.

Fixed an issue that caused the dropdown list of users to disappear
instead of opening a chat window after the first click of a user.
Removed pnotify alert that poped up when you try chatting with someone
you're already chatting with. Instead, the redundant requests will
result in a chat window opening.
debugging stuff
Added the ability to change your profile image to one from your harddrive

File checking is not complete, so large images are allowed for now
Merge branch 'master' into tweak
Profile pic edit
prepping for merging. redid permissions!! (ish)
added skinning stuff
Made site single page.
Merge branch 'master' of https://github.com/treycordova/learnit
Removing npm-debug.log
fixed fb/google chat
removed useless file
Fixed errors with fb and google logins and chat
Merge branch 'master' into improvedChatII

Conflicts:
	static/js/chatFunc.js
	views/layout.jade
recommit
Updated learnit.history.js to exclude remote login routes.
Merge branch 'master' of https://github.com/treycordova/learnit
getting ready to send down permissions to the client