new file:   .gitignore
	modified:   sqlite.db
Merge branch 'master' of github.com:sheenzhaox/effective_django