0000000000000000000000000000000000000000 108ae0dfa7679ccbbd6ca2bd66d9700121ea1701 MAX HANSON <mthanson5@wisc.edu> 1773196650 -0500	clone: from https://git.doit.wisc.edu/cdis/cs/courses/cs400/202601/students/mthanson5/P107.Integration
108ae0dfa7679ccbbd6ca2bd66d9700121ea1701 533fdb2b18c108edba73aa966e8ea3fcf4e7bdfa MAX HANSON <mthanson5@wisc.edu> 1773196693 -0500	checkout: moving from main to main~1
533fdb2b18c108edba73aa966e8ea3fcf4e7bdfa 533fdb2b18c108edba73aa966e8ea3fcf4e7bdfa MAX HANSON <mthanson5@wisc.edu> 1773196693 -0500	checkout: moving from 533fdb2b18c108edba73aa966e8ea3fcf4e7bdfa to backend
533fdb2b18c108edba73aa966e8ea3fcf4e7bdfa a46b3cf27ecddfe4f7aed389c3641b6b29aec72a MAX HANSON <mthanson5@wisc.edu> 1773196694 -0500	pull backend-remote main -X theirs --allow-unrelated-histories --no-edit: Merge made by the 'ort' strategy.
a46b3cf27ecddfe4f7aed389c3641b6b29aec72a 533fdb2b18c108edba73aa966e8ea3fcf4e7bdfa MAX HANSON <mthanson5@wisc.edu> 1773196694 -0500	checkout: moving from backend to main~1
533fdb2b18c108edba73aa966e8ea3fcf4e7bdfa 533fdb2b18c108edba73aa966e8ea3fcf4e7bdfa MAX HANSON <mthanson5@wisc.edu> 1773196694 -0500	checkout: moving from 533fdb2b18c108edba73aa966e8ea3fcf4e7bdfa to frontend
533fdb2b18c108edba73aa966e8ea3fcf4e7bdfa d87a3cb5694c923cebb89890834be6da0914cc33 MAX HANSON <mthanson5@wisc.edu> 1773196695 -0500	pull frontend-remote main -X theirs --allow-unrelated-histories --no-edit: Merge made by the 'ort' strategy.
d87a3cb5694c923cebb89890834be6da0914cc33 533fdb2b18c108edba73aa966e8ea3fcf4e7bdfa MAX HANSON <mthanson5@wisc.edu> 1773196695 -0500	checkout: moving from frontend to main~1
533fdb2b18c108edba73aa966e8ea3fcf4e7bdfa 533fdb2b18c108edba73aa966e8ea3fcf4e7bdfa MAX HANSON <mthanson5@wisc.edu> 1773196695 -0500	checkout: moving from 533fdb2b18c108edba73aa966e8ea3fcf4e7bdfa to tree
533fdb2b18c108edba73aa966e8ea3fcf4e7bdfa 1682cc6f36a36c76f1fefe2636b5b534a33accee MAX HANSON <mthanson5@wisc.edu> 1773196696 -0500	pull tree-remote main -X theirs --allow-unrelated-histories --no-edit: Merge made by the 'ort' strategy.
1682cc6f36a36c76f1fefe2636b5b534a33accee 108ae0dfa7679ccbbd6ca2bd66d9700121ea1701 MAX HANSON <mthanson5@wisc.edu> 1773196696 -0500	checkout: moving from tree to main
108ae0dfa7679ccbbd6ca2bd66d9700121ea1701 1682cc6f36a36c76f1fefe2636b5b534a33accee MAX HANSON <mthanson5@wisc.edu> 1773197227 -0500	checkout: moving from main to tree
1682cc6f36a36c76f1fefe2636b5b534a33accee d87a3cb5694c923cebb89890834be6da0914cc33 MAX HANSON <mthanson5@wisc.edu> 1773197378 -0500	checkout: moving from tree to frontend
d87a3cb5694c923cebb89890834be6da0914cc33 7cabbefb39205a7c8e513576c8fd39e0f8798df0 MAX HANSON <mthanson5@wisc.edu> 1773198627 -0500	commit: Implementing recommendations from JJIANG354 - https://git.doit.wisc.edu/cdis/cs/courses/cs400/202601/feedback/MTHANSON5/-/blob/main/P105CodeReviewByJJIANG354.md?ref_type=heads
7cabbefb39205a7c8e513576c8fd39e0f8798df0 108ae0dfa7679ccbbd6ca2bd66d9700121ea1701 MAX HANSON <mthanson5@wisc.edu> 1773198960 -0500	checkout: moving from frontend to main
108ae0dfa7679ccbbd6ca2bd66d9700121ea1701 f2745287384d71e8c50a8f8764c6cc270bde327d MAX HANSON <mthanson5@wisc.edu> 1773199115 -0500	merge tree: Merge made by the 'ort' strategy.
f2745287384d71e8c50a8f8764c6cc270bde327d 28ed35a7f6d8c8f4ec4335405637e5189622f6dd MAX HANSON <mthanson5@wisc.edu> 1773199402 -0500	commit (merge): commit merge changes from branch tree
28ed35a7f6d8c8f4ec4335405637e5189622f6dd d030716e71f231c0eab57d428b4a24445a69d65b MAX HANSON <mthanson5@wisc.edu> 1773199609 -0500	commit: merge changes from tree
d030716e71f231c0eab57d428b4a24445a69d65b 45771f1b3eb6b1047480dee14dc796c49244dd35 MAX HANSON <mthanson5@wisc.edu> 1773199801 -0500	commit (merge): merge backend changes
45771f1b3eb6b1047480dee14dc796c49244dd35 a46b3cf27ecddfe4f7aed389c3641b6b29aec72a MAX HANSON <mthanson5@wisc.edu> 1773199810 -0500	checkout: moving from main to backend
a46b3cf27ecddfe4f7aed389c3641b6b29aec72a 45771f1b3eb6b1047480dee14dc796c49244dd35 MAX HANSON <mthanson5@wisc.edu> 1773199826 -0500	checkout: moving from backend to main
45771f1b3eb6b1047480dee14dc796c49244dd35 79f73ed0feb5cb69ca5ddfb6f788fcf21637e900 MAX HANSON <mthanson5@wisc.edu> 1773201519 -0500	commit: compileAllTests: BackEndTests.java FrontendTests.java
79f73ed0feb5cb69ca5ddfb6f788fcf21637e900 8e1beeaf89b94a8e4ad11af9171a943f50f17861 MAX HANSON <mthanson5@wisc.edu> 1773201556 -0500	commit: create makefile
8e1beeaf89b94a8e4ad11af9171a943f50f17861 28a6fee7f8da0447a3118da781d55543f35f92be MAX HANSON <mthanson5@wisc.edu> 1773211521 -0500	commit: final boss of commits
28a6fee7f8da0447a3118da781d55543f35f92be 7cabbefb39205a7c8e513576c8fd39e0f8798df0 MAX HANSON <mthanson5@wisc.edu> 1773211586 -0500	checkout: moving from main to frontend
7cabbefb39205a7c8e513576c8fd39e0f8798df0 28a6fee7f8da0447a3118da781d55543f35f92be MAX HANSON <mthanson5@wisc.edu> 1773211619 -0500	checkout: moving from frontend to main
28a6fee7f8da0447a3118da781d55543f35f92be 53b9612b113e45514693bee70da70e12a6e0ab59 MAX HANSON <mthanson5@wisc.edu> 1773212085 -0500	commit: resolve merge conflicts
53b9612b113e45514693bee70da70e12a6e0ab59 9ade3031d0404c7f0567a5e53aaee5fd4820ab66 MAX HANSON <mthanson5@wisc.edu> 1773212249 -0500	commit: fixing merge conflicts with role file
9ade3031d0404c7f0567a5e53aaee5fd4820ab66 64db4012e7b06bbd3071b40bdcceee0c764f8f09 MAX HANSON <mthanson5@wisc.edu> 1773212474 -0500	commit: merge conflicts fixing
64db4012e7b06bbd3071b40bdcceee0c764f8f09 c730c2e2c1add2a77344c09ae1dfb95fc13233c2 MAX HANSON <mthanson5@wisc.edu> 1773212597 -0500	commit: merge conflicts fixing, please
