slide js committed
showing images committed
background.png
testing
Merge branch 'master' of http://runwalsoft/ooommm/repositories/ooommm
template file committed
Merge branch 'master' of http://runwalsoft/ooommm/repositories/ooommm
page 2 carousel css
Merge branch 'master' of http://runwalsoft/ooommm/repositories/ooommm

Conflicts:
	template_1/cre_video.tpl
	template_1/css/style.css
	template_1/header.tpl
	template_1/js/script.js
script error resolved
css of first and 2.2 page
js changes commited
Merge branch 'master' of http://runwalsoft/ooommm/repositories/ooommm

Conflicts:
	template_1/cre_video.tpl
	template_1/js/script.js