Merge branch 'master' of https://github.com/TuckerHaydon/Homework5

Conflicts:
	nbproject/project.properties