jsLint everything
Merge branch 'addisonBranch' of https://github.com/XYZMedia/shortProject into addisonBranch
deleted app/lib   updated gitignore
Merge branch 'addisonBranch'

Conflicts:
	.gitignore
	app/modules/articles/articleservice.js
	app/modules/articles/newpostcontroller.js
	app/modules/articles/onearticlecontroller.js
	app/modules/user/userservice.js
Merge branch 'master' of https://github.com/XYZMedia/shortProject

Conflicts:
	app/modules/articles/articleservice.js
	app/modules/articles/onearticlecontroller.js
	app/modules/header/headercontroller.js
Fix error starting server
resolved merge conflict
removed profilecontroller
Updates README
Merge branch 'mongo'