test merge
Merge branch 'master' of https://github.com/RichardSimko/EDA260-Team09

Conflicts:
	README.md
Merge branch 'master' of https://github.com/RichardSimko/EDA260-Team09