settings.py modified; sqlite3 database created;
Merge branch 'master' of https://github.com/L0K3/Django1

Conflicts:
	mysite/mysite/settings.py~