testing
first commit test pushing github
Merge branch 'chad' of https://github.com/ch4d/mep_django into jeriel
got linkedin profile extra data w/ oath1 and 2
including picture url and education
Added twitter bootstrap javascript and css files under static folder as well as some images. Also now have the home page rendering our template that is to be edited still. We can now go to localhost:8000 and see our home page in progress.
Merge branch 'damon' of https://github.com/ch4d/mep_django into jeriel

Conflicts:
	db.sqlite3
	mep_django/__init__.pyc
	mep_django/linkedin/__init__.pyc
	mep_django/linkedin/admin.pyc
	mep_django/linkedin/models.pyc
	mep_django/linkedin/pipeline.pyc
	mep_django/linkedin/views.py
	mep_django/linkedin/views.pyc
	mep_django/settings.py
	mep_django/settings.pyc
	mep_django/urls.pyc
	mep_django/wsgi.pyc
merged with damon's branch
fixed some things
cleaned up some unneeded templates
Login link pops up a new window but upon sign-on the new window redirects home and doesn't return to the parent page.
Added LinkedIn image for beginning the login. Made the sign-on window pop up in it's own window and then close and refresh the parent page upon successful login. Now that that is in place though another page should be made to handle a failed login.
Added the files I failed to add on last commit.
Successfully added the LinkedIn profile pic to the template
Made the login appear in it's own seperate window and then close and refresh the parent window on login.