add files
Merge branch 'master' of https://github.com/devon1277/aisra

Conflicts:
	product.php