first version of django 1.6 article
WIP
WIP
Merge branch 'master' into feature/django16
wip
Update 2013-10-24-django-16.md
with wercker+django img
story completed
 intro updated
move to today
Merge branch 'feature/django16' of github.com:wercker/wercker-blog into feature/django16

Conflicts:
	source/posts/2013-11-18-django-16.md
Merge branch 'master' into feature/django16
styling fix. empty lines removed
small text change
Merge branch 'feature/django16'