1st commit
	new file:   .gitignore
	new file:   __init__.py
	new file:   core/__init__.py
	new file:   core/models.py
	new file:   core/tests.py
	new file:   core/views.py
	new file:   fb/__init__.py
	new file:   fb/models.py
	new file:   fb/tests.py
	new file:   fb/views.py
	new file:   manage.py
	new file:   settings.py
	new file:   urls.py
	new file:   web/__init__.py
	new file:   web/models.py
	new file:   web/tests.py
	new file:   web/views.py
Commit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to githubCommit to github
	modified:   core/models.py
	modified:   core/tests.py
	modified:   settings.py
Merge github.com:gergalerg/ducking-hipster

Conflicts:
	.gitignore

	modified:   .gitignore
	new file:   README.md