fix
ignore uploaf.php

Conflicts:
	upload.php
Revert "ignore uploaf.php"

This reverts commit dc4681e078a794888b6071bda2d24e5fd5d285ad.
Beta2
Beta3
Show_item_detatil show multiple pictures
fix border
examine active or not
Message check activate or not
resend_license_email
fix error
modify_check
Merge branch 'master' of https://github.com/mick90207/NTUeMarket-GitHub

Conflicts:
	Add_Member_Database.php
	header.php
	registration.php
merge
Merge branch 'master' of https://github.com/mick90207/NTUeMarket-GitHub

Conflicts:
	Add_Member_Database.php
	bootstrap/css/style.css
	header.php
	registration.php