0000000000000000000000000000000000000000 c44140e72a1070f07747ee5c9f2d94ec83d51beb Cas Janse <cas.janse97@gmail.com> 1517085763 +0100	branch: Created from origin/Merge_Fix
c44140e72a1070f07747ee5c9f2d94ec83d51beb e4587b8d374f80a41d76fe57df43ca591da9ff0b Cas Janse <cas.janse97@gmail.com> 1517086528 +0100	commit: THA WEA
e4587b8d374f80a41d76fe57df43ca591da9ff0b de208f250e6e14772728a9386fc194afa9990079 Cas Janse <cas.janse97@gmail.com> 1517095165 +0100	pull --no-commit origin Merge_Fix: Fast-forward
de208f250e6e14772728a9386fc194afa9990079 c45636b9cd7ace3e15ee4ca18a3ba2110ec4c1ff Cas Janse <cas.janse97@gmail.com> 1517095310 +0100	merge Pizza_Inleveren_V2: Merge made by the 'recursive' strategy.
c45636b9cd7ace3e15ee4ca18a3ba2110ec4c1ff 2a2c979a229040d89aa56fbb258a13180740835b Cas Janse <cas.janse97@gmail.com> 1517098116 +0100	pull --no-commit origin Merge_Fix: Fast-forward
2a2c979a229040d89aa56fbb258a13180740835b 13c9ad9c711d3b25358a1384d9310eb4ee5ca4ee Cas Janse <cas.janse97@gmail.com> 1517098150 +0100	commit: Whoops
13c9ad9c711d3b25358a1384d9310eb4ee5ca4ee b207e59c1cfbfa72340beb8defb4591880b940f7 Cas Janse <cas.janse97@gmail.com> 1517098220 +0100	commit (merge): Merge branch 'Pizza_Collision_Toppings' into Merge_Fix
b207e59c1cfbfa72340beb8defb4591880b940f7 7f9b3e805128f74203152c6d1881a876100dc4a4 Cas Janse <cas.janse97@gmail.com> 1517102856 +0100	commit: Minor bugfixing
7f9b3e805128f74203152c6d1881a876100dc4a4 160cb747795da275662aacb8c3e27845168d69f4 Cas Janse <cas.janse97@gmail.com> 1517102882 +0100	commit (merge): Merge branch 'Merge_Fix' of gitlab.fdmci.hva.nl:ruiterd1/GlobalGameJam2018 into Merge_Fix
160cb747795da275662aacb8c3e27845168d69f4 d19508139264e5e93a6186d62ad22130e2449353 Cas Janse <cas.janse97@gmail.com> 1517104455 +0100	commit: Fixed: Layers
d19508139264e5e93a6186d62ad22130e2449353 ee948162f4ab8f65dc4b7e7917c03fb99e1a2836 Cas Janse <cas.janse97@gmail.com> 1517105594 +0100	pull --no-commit origin Merge_Fix: Fast-forward
ee948162f4ab8f65dc4b7e7917c03fb99e1a2836 f5429be68bd876667afdf81eb15ba8c777359580 Cas Janse <cas.janse97@gmail.com> 1517106242 +0100	pull --no-commit origin Merge_Fix: Fast-forward
f5429be68bd876667afdf81eb15ba8c777359580 f7aa70d2c957c3b4242365164ae6c6e1ec550815 Cas Janse <cas.janse97@gmail.com> 1517110983 +0100	pull --no-commit origin Merge_Fix: Fast-forward
f7aa70d2c957c3b4242365164ae6c6e1ec550815 effc415f986b76aa3054bf925773378363f1a7c8 Cas Janse <cas.janse97@gmail.com> 1517111069 +0100	commit (merge): Merge branch 'Pizza_Ingredient_Interaction' into Merge_Fix
effc415f986b76aa3054bf925773378363f1a7c8 1c732a7be8b191fb17030c01cf4b6e8b4d65952b Cas Janse <cas.janse97@gmail.com> 1517111418 +0100	pull --no-commit origin Merge_Fix: Fast-forward
1c732a7be8b191fb17030c01cf4b6e8b4d65952b 0d337105676c6410522e193f4273686e51d877c7 Cas Janse <cas.janse97@gmail.com> 1517111803 +0100	pull --no-commit origin Merge_Fix: Fast-forward
0d337105676c6410522e193f4273686e51d877c7 77b59d480c50b34a56833086b17e2c5b4fd33b92 Cas Janse <cas.janse97@gmail.com> 1517113142 +0100	commit: pizza pakt nu ingredienten op en bewaart ze op de pizza.
77b59d480c50b34a56833086b17e2c5b4fd33b92 9056dba7df48c36e7ad976091c7b0e4c84111a88 Cas Janse <cas.janse97@gmail.com> 1517123819 +0100	pull --no-commit origin Merge_Fix: Fast-forward
9056dba7df48c36e7ad976091c7b0e4c84111a88 99cbe8d5a12d682fc6f49e98278adc492dede758 Cas Janse <cas.janse97@gmail.com> 1517129284 +0100	pull --no-commit origin Merge_Fix: Fast-forward
99cbe8d5a12d682fc6f49e98278adc492dede758 4bbfd512e2cdbfdd48aa965903b6046d75067961 Cas Janse <cas.janse97@gmail.com> 1517133293 +0100	pull --no-commit origin Merge_Fix: Fast-forward
4bbfd512e2cdbfdd48aa965903b6046d75067961 c4d7131ebb7c88d563e2ab05a03bc64a984b180a Cas Janse <cas.janse97@gmail.com> 1517133337 +0100	merge Pizza_Information_GameManager: Merge made by the 'recursive' strategy.
c4d7131ebb7c88d563e2ab05a03bc64a984b180a 8c46edbcc1986b6a5bc4612def1142feda6e5006 Cas Janse <cas.janse97@gmail.com> 1517134525 +0100	merge Individual_Pizza_Score: Merge made by the 'recursive' strategy.
8c46edbcc1986b6a5bc4612def1142feda6e5006 0dee415af4ac05c44287158fd8e994c4e1884a53 Cas Janse <cas.janse97@gmail.com> 1517135846 +0100	pull --no-commit origin Merge_Fix: Fast-forward
0dee415af4ac05c44287158fd8e994c4e1884a53 301ad3cd7138bd76f85b7d366dec838082cf80b2 Cas Janse <cas.janse97@gmail.com> 1517137377 +0100	pull --no-commit origin Merge_Fix: Fast-forward
301ad3cd7138bd76f85b7d366dec838082cf80b2 219ce61fa34d69b108329904fb91bf5612c40acb Cas Janse <cas.janse97@gmail.com> 1517137718 +0100	pull --no-commit origin Merge_Fix: Fast-forward
219ce61fa34d69b108329904fb91bf5612c40acb 69abfa1aa593bb147fbb05229abc2384b816fab4 Cas Janse <cas.janse97@gmail.com> 1517140021 +0100	pull --no-commit origin Merge_Fix: Fast-forward
69abfa1aa593bb147fbb05229abc2384b816fab4 951509a72a01041adc9bbcf4bfe3b1e127cef08a Cas Janse <cas.janse97@gmail.com> 1517144200 +0100	pull --no-commit origin Merge_Fix: Fast-forward
951509a72a01041adc9bbcf4bfe3b1e127cef08a db44bc1d08e33635190bc1df6c061a8317c9631f Cas Janse <cas.janse97@gmail.com> 1517145691 +0100	pull --no-commit origin Merge_Fix: Fast-forward
db44bc1d08e33635190bc1df6c061a8317c9631f 90a96cf4141c713e4118acfc48cf36e5f255251d Cas Janse <cas.janse97@gmail.com> 1517146853 +0100	pull --no-commit origin Merge_Fix: Fast-forward
