prepping for merging. redid permissions!! (ish)
getting ready to send down permissions to the client
added files that were already added
Moved profileImgs and fixed a bug.
Reenabled single page fanciness
Merge branch 'master' of https://github.com/treycordova/learnit
Merge branch 'master' of git://github.com/treycordova/learnit
Merge branch 'master' of git://github.com/treycordova/learnit
Removed some console.logs
got gestalt working. next up, permissions on gestatalt!!!

Merge branch 'master' of https://github.com/treycordova/learnit

Conflicts:
	static/css/style.css
	static/js/chatFunc.js
	static/js/gestalt.js
	views/layout.jade
final commit of the night. Still need to get submitting edited modules in
gestalt working.

Merge branch 'master' of https://github.com/treycordova/learnit

Conflicts:
	static/js/chatFunc.js
adding new editor js
Merge branch 'master' of https://github.com/treycordova/learnit
made a quick fix to fetching modules
Got the edit working with the gestalt map.
Added stuff
Merge branch 'master' of https://github.com/treycordova/learnit

Conflicts:
	controllers/module.controller.js
Removed disgusting console.logs
Login now changes home button link to link to the landing page. Error message is now comfy in a container.
Merge branch 'master' of https://github.com/treycordova/learnit