commiting to pull
Merge branch 'master' of github.com:paulovillani/camprulho

Conflicts:
	base/templates/home.html
	base/templates/post.html