progress bar ready to merge
Merge pull request #25 from dyoachim/progressBar

progress bar ready to merge
fix merge errors