Creating template
Commit from JBoss Tools
Commit from JBoss Tools
Initial domain modeling started
Test commit
Merge branch 'master' of
ssh://51d185e55973ca8b93000054@ski-andybernhagen.rhcloud.com/~/git/ski.git/

Conflicts:
	.gitignore
	.settings/.jsdtscope
Git testing
Commit from JBoss Tools
Another git test
Commit from JBoss Tools
Resetting project to base.
Syncing openshift and github repos