Creating template
init
Merge branch 'master' of ssh://parochecker-gabyline.rhcloud.com/~/git/parochecker

Conflicts:
	.project
c
changes
delete db.tss
push