stuff added
Merge branch 'master' of https://github.com/jlyons871/1573Team1984.git

Conflicts:
	README.md