redirect
profile minor change
no idea why it did't work
fb_connect
merge gitig
profile.html
deleted crap
json working
deleted garbage files
jsonification / html template
Merge branch 'master' into js-fb-frontend

Conflicts:
	social_secretary/ss_app/views.py
	social_secretary/urls.py
pep8
Merge pull request #19 from galarant/js-fb-frontend

Js fb frontend
Merge branch 'master' into contracts_json_template
Merge branch 'master' into contracts_json_template

Conflicts:
	social_secretary/ss_app/views.py
pep8
Merge pull request #22 from galarant/contracts_json_template

Contracts json template
BOOM
Merge pull request #23 from galarant/load_contacts_into_template

BOOM
fb connect