Subject: Slides for Django: Day 1 & 2
Merge branch 'master' of https://github.com/psachin/slides

Conflicts:
	django-interns-2014/day-2.org
	django-interns-2014/day-2.pdf
	django-interns-2014/day-2.tex