0000000000000000000000000000000000000000 782d4551dab5d41b702caa9046def3273fba93d5 Esteban Carranza <esteban.carranza@outlook.com> 1517107823 -0600	clone: from https://github.com/EstebanCarranza1/GGJ18.git
782d4551dab5d41b702caa9046def3273fba93d5 ede5b653efc01d930de338c1ae0d82e1a95e708b Esteban Carranza <esteban.carranza@outlook.com> 1517121248 -0600	commit: Disparos desde las torretas
ede5b653efc01d930de338c1ae0d82e1a95e708b 652ff659e638657901126d8667a18453ca41e53c Esteban Carranza <esteban.carranza@outlook.com> 1517121256 -0600	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
652ff659e638657901126d8667a18453ca41e53c 0300656fea099d7e583f106528f929900e40e955 Esteban Carranza <esteban.carranza@outlook.com> 1517122827 -0600	pull --no-rebase --progress origin: Fast-forward
0300656fea099d7e583f106528f929900e40e955 fc0425147019d83aeff8f6efda4cdff58315702a Esteban Carranza <esteban.carranza@outlook.com> 1517124040 -0600	commit: otro
fc0425147019d83aeff8f6efda4cdff58315702a 2cb839c37913c54c0ba24aa5a1611bbdbd0f76f8 Esteban Carranza <esteban.carranza@outlook.com> 1517124100 -0600	commit (merge): Merge branch 'master' of https://github.com/EstebanCarranza1/GGJ18
2cb839c37913c54c0ba24aa5a1611bbdbd0f76f8 94a738babfdba4ccad444037d834a51df4451eab Esteban Carranza <esteban.carranza@outlook.com> 1517124884 -0600	pull --no-rebase --progress origin: Fast-forward
94a738babfdba4ccad444037d834a51df4451eab ac687a0b7f7dfe6208f84b3af41f1aaf29b00a60 Esteban Carranza <esteban.carranza@outlook.com> 1517125454 -0600	commit: cambio de escenario
ac687a0b7f7dfe6208f84b3af41f1aaf29b00a60 fcc7d35d78443a03d7af1d5b4d9ab519e3a54648 Esteban Carranza <esteban.carranza@outlook.com> 1517128812 -0600	pull --no-rebase --progress origin: Fast-forward
fcc7d35d78443a03d7af1d5b4d9ab519e3a54648 b0004e8d8d4faafa5c5a87469ccd34cf9c3803fd Esteban Carranza <esteban.carranza@outlook.com> 1517132029 -0600	commit: Transmision del rayo para encender las torretas
b0004e8d8d4faafa5c5a87469ccd34cf9c3803fd a76a557deba851184b36710a981ceb894ee845b2 Esteban Carranza <esteban.carranza@outlook.com> 1517132037 -0600	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
a76a557deba851184b36710a981ceb894ee845b2 af898074c255c08b7aa67ff9c52c597f4a048c11 Esteban Carranza <esteban.carranza@outlook.com> 1517132729 -0600	pull --no-rebase --progress origin: Fast-forward
af898074c255c08b7aa67ff9c52c597f4a048c11 4f6c576943ed0a8b69843602a17f0132f442b430 Esteban Carranza <esteban.carranza@outlook.com> 1517133795 -0600	commit: escenario
4f6c576943ed0a8b69843602a17f0132f442b430 0678608346da8191f56a0294afcbeca2240ea6a6 Esteban Carranza <esteban.carranza@outlook.com> 1517135954 -0600	commit: Corrección de escenario
0678608346da8191f56a0294afcbeca2240ea6a6 3064dacba2d10c45352d926855fb811899099d68 Esteban Carranza <esteban.carranza@outlook.com> 1517137679 -0600	commit: Tiempo
3064dacba2d10c45352d926855fb811899099d68 99d0dc328a8ff3031e6f4a3ebb943d536a0bad25 Esteban Carranza <esteban.carranza@outlook.com> 1517137698 -0600	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
99d0dc328a8ff3031e6f4a3ebb943d536a0bad25 ae51449df8e23ce7e3eea77e727d51bfed0e3ca1 Esteban Carranza <esteban.carranza@outlook.com> 1517137752 -0600	revert: Revert "Merge branch 'master' of https://github.com/EstebanCarranza1/GGJ18"
ae51449df8e23ce7e3eea77e727d51bfed0e3ca1 27160f471dba794e61322b9cbfcb5b7dc672e1cc Esteban Carranza <esteban.carranza@outlook.com> 1517138237 -0600	pull --no-rebase --progress origin: Merge made by the 'recursive' strategy.
