Initial commit
Initial commit. Basic home page, nothing more.
Deployment settings for uwsgi.
Development changes and working to stage the blog on a subdomain.
Merge https://github.com/brandonjschwartz/boomajoom
[no text]
Redo.
sqla
Merge https://github.com/brandonjschwartz/boomajoom

Conflicts:
	.gitignore
	README.txt
	boomajoom/__init__.py
	boomajoom/tests.py
	production.ini
	setup.cfg
	setup.py
Migrating project to Django.
Migrate to Django.
Migrate to Django
Create README.md
Refactor lib
Static file changes
Local settings file.
The mystical green unicorn.
Settings change
Django error on allowed hosts
Merge branch 'master' of https://github.com/brandonjschwartz/boomajoom

Conflicts:
	.gitignore
	bookmarks/forms.py
	bookmarks/views.py
	boomajoom/settings.py
	boomajoom/urls.py
	templates/base.html
	templates/bookmarks/bookmark_list.html
	templates/index.html
	templates/registration/login.html