rewrite to bootstrap v3RC2
Merge branch 'master' of https://github.com/thehawkes/mybootstrap

Conflicts:
	templates/article.html
	templates/base.html
	templates/index.html