testing
Merge branch 'chad' of https://github.com/ch4d/mep_django into jeriel
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
cleaned up pyc files
pulling in lastest branch
fixed cancel on login request
added blank templates for about and contact links