Initial running version
Merge branch 'master' of github.com:thelfensdrfer/risk

Conflicts:
	.gitignore