some final play around
last push hopefully
removed garbage file
Merge branch 'master' into last_branch

Conflicts:
	social_secretary/ss_app/templates/set_contacts.html
Merge pull request #28 from galarant/last_branch

Last branch