Resolved conflict
Merge branch 'master' of github.com:RichardSimko/EDA260-Team09

Conflicts:
	README.md