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

Conflicts:
	templates/new.html
	tool/config.py
Merge branch 'master' of https://github.com/ttc9082/Rental