Connected both programs
fix conflict
Merge branch 'master' of https://github.com/alebie/waterkiller