Creating template
Merge branch 'master' of https://github.com/kernelbeau/osmez
initial commit
initial commit
Merge branch 'master' of ssh://osmez-kernelbeau.rhcloud.com/~/git/osmez

Conflicts:
	requirements.txt
Merge branch 'master' of ssh://osmez-kernelbeau.rhcloud.com/~/git/osmez

Conflicts:
	requirements.txt
Merge branch 'master' of ssh://osmez-kernelbeau.rhcloud.com/~/git/osmez

Conflicts:
	requirements.txt
Merge branch 'master' of ssh://osmez-kernelbeau.rhcloud.com/~/git/osmez

Conflicts:
	requirements.txt
Merge branch 'master' of ssh://osmez-kernelbeau.rhcloud.com/~/git/osmez

Conflicts:
	requirements.txt