'back in time'
Merge branch 'master' of https://github.com/MiguelGervasi/mysiteproject

Conflicts:
	inventory/templates/inventory/index.html