Updated .gitignore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
Merge remote-tracking branch 'upstream/master'
Implemented linkedin login strategy.
Implemented linkedin login strategy.

Merge remote-tracking branch 'upstream/master'

Resolved Conflicts:
	.gitignore
	config/routes.js
	controllers/users.js
	package.json
Merge pull request #15 from venuz/master

New login strategy added