0000000000000000000000000000000000000000 0ff3d4d94ea709cdb0bf0cf4f05c5f7d3fa4abf2 Alisha <alisha1845@gmail.com> 1454105938 +1100	clone: from https://Alisha_S@bitbucket.org/JWalt/woodswitch.git
0ff3d4d94ea709cdb0bf0cf4f05c5f7d3fa4abf2 15d6d094b13d14edbeb852a5c0817410fbeedc5e Alisha <alisha1845@gmail.com> 1454106358 +1100	pull origin master: Fast-forward
15d6d094b13d14edbeb852a5c0817410fbeedc5e 0ebf7fd6c9d9c6bba1f63dff2f35d7541395ee53 Alisha <alisha1845@gmail.com> 1454106693 +1100	pull origin master: Fast-forward
0ebf7fd6c9d9c6bba1f63dff2f35d7541395ee53 fc8045edc54ae50ff13d50c4623a7e46d1c1d0ff Alisha <alisha1845@gmail.com> 1454107825 +1100	pull origin master: Fast-forward
fc8045edc54ae50ff13d50c4623a7e46d1c1d0ff a45e68d7e2f87ff72e25e96e662eaf46fee69daf Alisha <alisha1845@gmail.com> 1454113669 +1100	pull origin master: Fast-forward
a45e68d7e2f87ff72e25e96e662eaf46fee69daf 29d265f627f0c086b283044d62feec7e9ca4c622 Alisha <alisha1845@gmail.com> 1454113703 +1100	commit: Added in placeholder stuff/ GUI
29d265f627f0c086b283044d62feec7e9ca4c622 67e8bfbed2fedd1e829c7469cb374ddc3a02a7a8 Alisha <alisha1845@gmail.com> 1454114240 +1100	pull origin master: Fast-forward
67e8bfbed2fedd1e829c7469cb374ddc3a02a7a8 25127470502b19967283031bc00d7e6f665ecc82 Alisha <alisha1845@gmail.com> 1454114354 +1100	commit: Sprites plz
25127470502b19967283031bc00d7e6f665ecc82 458dabe6d25129c2e6cc9ec7e76035c201d29fc0 Alisha <alisha1845@gmail.com> 1454143448 +1100	commit: Big changes, scenes, gui etc
458dabe6d25129c2e6cc9ec7e76035c201d29fc0 718841b469f441549652587fb929fad7f6713e24 Alisha <alisha1845@gmail.com> 1454143613 +1100	commit (merge): Merge branch 'master' of https://bitbucket.org/JWalt/woodswitch
718841b469f441549652587fb929fad7f6713e24 0bc1b0bea8e356f1ac6cadcb079caacce91acb92 Alisha <alisha1845@gmail.com> 1454145042 +1100	commit: Just to be safe
0bc1b0bea8e356f1ac6cadcb079caacce91acb92 6a9ed2016592e876683b08caa9706a128c941356 Alisha <alisha1845@gmail.com> 1454148654 +1100	commit: Adding magic smoke animation/ fairy animation/ config person spawn (and different types)
6a9ed2016592e876683b08caa9706a128c941356 8fb74f40026f388fb04dd7b5f6ccf173be68fd66 Alisha <alisha1845@gmail.com> 1454148665 +1100	pull origin master: Merge made by the 'recursive' strategy.
8fb74f40026f388fb04dd7b5f6ccf173be68fd66 0287529441a5df3a1716c04c2b702f1be908b87f Alisha <alisha1845@gmail.com> 1454149090 +1100	commit: trying to solve sound conflict
0287529441a5df3a1716c04c2b702f1be908b87f 5691e1d638adb6fbebfab7318be147ee698891ed Alisha <alisha1845@gmail.com> 1454149101 +1100	pull origin master: Merge made by the 'recursive' strategy.
5691e1d638adb6fbebfab7318be147ee698891ed 8198bb956ed13a84f7e87083180c373a577dcaa8 Alisha <alisha1845@gmail.com> 1454152289 +1100	commit: sounds/prefab setup
8198bb956ed13a84f7e87083180c373a577dcaa8 125b5c267d1386d63d5d330d457bfc8828213527 Alisha <alisha1845@gmail.com> 1454152312 +1100	pull origin master: Merge made by the 'recursive' strategy.
125b5c267d1386d63d5d330d457bfc8828213527 430fef1e175f63fbb45402ac870060f79b2fc658 Alisha <alisha1845@gmail.com> 1454152829 +1100	pull origin master: Fast-forward
430fef1e175f63fbb45402ac870060f79b2fc658 a9f5e45814a1b575cc09961b7e17677e1d4be829 Alisha <alisha1845@gmail.com> 1454195343 +1100	commit: fairy move animation / score
a9f5e45814a1b575cc09961b7e17677e1d4be829 f3c5451a49db742e71bc2bc34cbfcb655944bc38 Alisha <alisha1845@gmail.com> 1454196131 +1100	commit: snowman/ frog spawn
f3c5451a49db742e71bc2bc34cbfcb655944bc38 8f5e60ab598196263d5009766aa7d03bfd9ad5a4 Alisha <alisha1845@gmail.com> 1454196143 +1100	pull origin master: Merge made by the 'recursive' strategy.
8f5e60ab598196263d5009766aa7d03bfd9ad5a4 91b1ed6ab6069d96aae10d906df5e8662552bf47 Alisha <alisha1845@gmail.com> 1454204203 +1100	commit: no message
91b1ed6ab6069d96aae10d906df5e8662552bf47 665bfc824a4c379e8d10b3c7572759eb4eae02b8 Alisha <alisha1845@gmail.com> 1454204925 +1100	commit: assets PLZ WORK
665bfc824a4c379e8d10b3c7572759eb4eae02b8 7426b4f47a0b2c16419d1a0b12e984feb4895f70 Alisha <alisha1845@gmail.com> 1454209852 +1100	commit: more minor changes
7426b4f47a0b2c16419d1a0b12e984feb4895f70 9bf4244d7dfd2459012757e8c85ccb6f4c6d0150 Alisha <alisha1845@gmail.com> 1454210064 +1100	commit (merge): Merge branch 'master' of https://bitbucket.org/JWalt/woodswitch
9bf4244d7dfd2459012757e8c85ccb6f4c6d0150 07e4e351ba7582898ecd1c7abec3ba3ea8cece98 Alisha <alisha1845@gmail.com> 1454210092 +1100	pull origin master: Merge made by the 'recursive' strategy.
07e4e351ba7582898ecd1c7abec3ba3ea8cece98 b3d07614dea4bd8c46ec367c445d6acf51517cfe Alisha <alisha1845@gmail.com> 1454211368 +1100	commit: touch control config
b3d07614dea4bd8c46ec367c445d6acf51517cfe 9f6f3c29e030d713395740127356a854f046c003 Alisha <alisha1845@gmail.com> 1454211675 +1100	commit (merge): Merge branch 'master' of https://bitbucket.org/JWalt/woodswitch
9f6f3c29e030d713395740127356a854f046c003 288e687be32d850e815285a3f3073c8b992923c5 Alisha <alisha1845@gmail.com> 1454212885 +1100	commit: final?
