did stuff to rent.slim
Merge branch 'master' of https://github.com/nlts/sinatra_dbproject

Conflicts:
	views/application.slim
	views/maintenance_request.slim

Worked on the rent payment functionality
Merge remote-tracking branch 'origin/master'