Creating template
Merge branch 'master' of github.com:zherk/EcoFam
Openshift config
New gems
Added hooks
Centered content
Merge branch 'master' of ssh://econofam-zherkingdom.rhcloud.com/~/git/econofam

Conflicts:
	Gemfile
	Gemfile.lock