css to shit
Merge branch 'master' of github.com:mgm1992/Dim

Conflicts:
	SocialStalker/SocialStalker/settings.pyc