Initial commit
pull from git-osc
fixed conflict .gitignore