Creating template
Merge branch 'master' of ssh://hackathon-lopezpagan.rhcloud.com/~/git/hackathon