Initial commit
Merge branch 'master' of github.com:weritos666/JSR

Conflicts:
	.gitignore