i forget
Merge remote-tracking branch 'upstream/master' into mybranch
Merge remote-tracking branch 'upstream/master' into mybranch
Merge remote-tracking branch 'upstream/master' into mybranch
changed main functions to avoid error
changed makefile, readme
changed main params
Merge pull request #31 from dlazell/mybranch

Mybranch