changed absolute dir to relative loll
fixed merge
Merge branch 'master' of github.com:jxu577/flitycs

Conflicts:
	flitycs/settings.py