adding files
Merge branch 'master' of https://github.com/oProject/oProject.git
Merge branch 'master' of https://github.com/oProject/oProject.git

Conflicts:
	style.css
Merge branch 'master' of https://github.com/oProject/oProject.git
Merge branch 'master' of https://github.com/oProject/oProject.git
Merge branch 'master' of https://github.com/oProject/oProject.git
Merge branch 'master' of https://github.com/oProject/oProject.git
updates
ok
Merge branch 'master' of https://github.com/oProject/oProject.git

Conflicts:
	globalDefine.php
	globalFunction.php
	insert.php
	insertPro.php
	style.css
	testing.php
	update.php
update