house rent added
Merge origin/master

Conflicts:
	salary.php