updating local files
Merge remote-tracking branch 'origin/master'

updates made on github
Changing the project state from "ongoing" to "nope"