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

Conflicts:
	config.ru
openshift doesn't allow ruby version specification in Gemfile
configs
hello world
create user model
try to fix benign bug
does not fix
streaming experiment
log
shit
sse working
readme
Creating template
configs
Merge branch 'master' of ssh://geochat-awaw.rhcloud.com/~/git/geochat

Conflicts:
	.openshift/action_hooks/start
	README.md
Merge branch 'master' of ssh://geochat-awaw.rhcloud.com/~/git/geochat

Conflicts:
	.openshift/action_hooks/start
	README.md
Merge branch 'master' of ssh://geochat-awaw.rhcloud.com/~/git/geochat

Conflicts:
	.openshift/action_hooks/build
hooks