Merge branch 'Project3' of https://github.com/harrisonBornstein/Project3 into Project3

Conflicts:
Project2Final/src/jFrame.java
Find AUthor