Merge branch 'master' of https://github.com/hyper3xpl0iter/th3c1inic_www

Conflicts:
	.gitignore
	static/css/errors.css
	static/img/blog/th3c1inic_logotrans.png
	static/static/css/base.css
	static/static/js/tweets_hyper3xpl0iter.js
	templates/base.html
	templates/errors/404.html
	templates/errors/errors.html
	th3c1inic_www/urls.py