Creating a conflict

Merged Whitney Armstrong requested to merge readme_update into master

Merge request reports