~* ._* .TemporaryItems .DS_Store Thumbs.db <<<<<<< HEAD /bin/ *.class *.jar *.war *.ear hs_error_pid* *.slo *.lo *.o *.obj *.gch *.pch *.so *.dylib *.mod *.lai *.la *.a *.dll *.lib *.exe *.app ======= >>>>>>> branch 'master' of https://web-cat.cs.vt.edu/Web-CAT/WebObjects/Web-CAT.woa/git/StudentProject/79171506-4647-4b68-9fc0-dbd3e3cf1970 /bin/