prepend.php committed
Merge branch 'master' of https://github.com/8manos/ooommm-mmmooo

Conflicts:
	template_1/js/script.js
js commited
Merge branch 'master' of https://github.com/8manos/ooommm-mmmooo

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