Merge branch 'master' of git://github.com/opensas/play2-openshift-quickstart
deploy
Please enter the commit message for your changes. Lines starting
config change
asads
asda
asds
asds2
asds3
asds5
asds7
Merge branch 'master' of ssh://go-atok.rhcloud.com/~/git/go

Conflicts:
	.gitignore
cleanup