Fixed conflicts
Updated readme
Updated readme
Initial commit on develop branch
Added readme
Added example output to readme