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

Conflicts:
	template_1/sequence.tpl
fiels committed