adding progs
Merge remote-tracking branch 'upstream/master'
update source from upstream
edit gitignore