ee
Merge branch 'master' of https://github.com/ttc9082/Rental

Conflicts:
	templates/index.html
Merge branch 'master' of https://github.com/ttc9082/Rental