sjf
update
Merge branch 'master' of https://github.com/wesleyEversole/CS_149-WCC

Conflicts:
	Assignment 2/src/main.java