files that i need to commit so i can be up to date with the repo
Merge branch 'master' of https://github.com/wesleyEversole/CS_149-WCC

Conflicts:
	Assignment 2/src/SJF.java