add django
Merge branch 'master' of github.com:Gashington/portfolio

Conflicts:
	dev/contact.html
	dev/css/main.css
	dev/css/media.css
	dev/css/widgets.css
	dev/js/plugins.js
	dev/portfolio.html
	dev/stylus/main.styl
	dev/stylus/widgets.styl