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