Added the template base.html, refactoring all the html to extendes the template base
Merge remote-tracking branch 'origin/master'

Conflicts:
	rango.db