Merge branches 'master' and 'dan' into dan
Merged Damon's branch and added the script to pull linkedin group data
building server script, added models for linkedin groups
merged latest build
added pictures to the news posts
cleaned some things up
added linked in glyph
Merge remote-tracking branch 'origin/chad' into jeriel

Conflicts:
	templates/home.html
Testing some things
merged Jeriel's branch
Added News feed for company, user feed will be difficult
made updates to the news page and the about page
made updates to the news page and the about page
old work
merged lasted from jeriel
cleaned up some stuff, added some inline styling to news as a quick fix. The front end group will need to come up with a better solution.
Merged latest pull request from Dan.