Formatting
Solve conflicts
Merge branch 'master' of github.com:applidget/psdock
Added readme
Merge pull request #4 from efatih/add-readme

Added readme