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

Conflicts:
	controllers/module.controller.js