a
Merge remote-tracking branch 'origin/master'

Conflicts:
	CreditHouseNetbean/nbproject/private/private.xml
	CreditHouseNetbean/public_html/css/main.css
	CreditHouseNetbean/public_html/index.html