5432

Conflicts:
	hugoblog/blog/__pycache__/admin.cpython-34.pyc
	hugoblog/blog/__pycache__/models.cpython-34.pyc
	hugoblog/blog/__pycache__/urls.cpython-34.pyc
	hugoblog/blog/__pycache__/views.cpython-34.pyc
	hugoblog/blog/admin.py
	hugoblog/blog/models.py
	hugoblog/blog/urls.py
	hugoblog/blog/views.py
	hugoblog/hugoblog/__pycache__/settings.cpython-34.pyc
	hugoblog/hugoblog/__pycache__/urls.cpython-34.pyc
	hugoblog/hugoblog/settings.py
	hugoblog/hugoblog/urls.py
	hugoblog/static/css/blog.css

4321