0000000000000000000000000000000000000000 a4b729f518c393dd150cbe56f99b6c320f084acd Elisa Marchione <elisa@yomigatech.com> 1422136236 -0700	initial pull
a4b729f518c393dd150cbe56f99b6c320f084acd 93061d52c53d21d069c7b1830404790e31cc9cb0 Elisa Marchione <elisa@yomigatech.com> 1422139079 -0700	commit: Added basic functionality of determining who confirmed location first
93061d52c53d21d069c7b1830404790e31cc9cb0 c805ba1bde203557e4db49c0bf9ddb4bfe693202 Elisa Marchione <elisa@yomigatech.com> 1422139096 -0700	pull origin master: Merge made by the 'recursive' strategy.
c805ba1bde203557e4db49c0bf9ddb4bfe693202 b0494de09be62ffbe3f9318b031c56857637ab3c Elisa Marchione <elisa@yomigatech.com> 1422142299 -0700	commit: Improved zone tracking for real-time and confirmed zones.
b0494de09be62ffbe3f9318b031c56857637ab3c adbaff1a7b708a54d5698f023588d1a0cf4f0977 Elisa Marchione <elisa@yomigatech.com> 1422142309 -0700	pull origin master: Merge made by the 'recursive' strategy.
adbaff1a7b708a54d5698f023588d1a0cf4f0977 9af11ba3f123ee6d4460aee6a6741478f120d974 Elisa Marchione <elisa@yomigatech.com> 1422145058 -0700	commit: Added third player functionality
9af11ba3f123ee6d4460aee6a6741478f120d974 39b80c7e59682c6521ee5bad9e0d9ad8a58e4d0f Elisa Marchione <elisa@yomigatech.com> 1422145076 -0700	pull origin master: Merge made by the 'recursive' strategy.
39b80c7e59682c6521ee5bad9e0d9ad8a58e4d0f 79b53d398c4fff9614c6beea2e2fedc73a1e9df0 Elisa Marchione <elisa@yomigatech.com> 1422147771 -0700	commit: Improved zone confirmation mechanic
79b53d398c4fff9614c6beea2e2fedc73a1e9df0 400445cf6fd87de5a79fc91ea3878eb323b4e154 Elisa Marchione <elisa@yomigatech.com> 1422147787 -0700	pull origin master: Merge made by the 'recursive' strategy.
400445cf6fd87de5a79fc91ea3878eb323b4e154 432715fda1bfd49d40abea9eb01e5a8a2c4b76cb Elisa Marchione <elisa@yomigatech.com> 1422150437 -0700	commit: Fixed issue with requiring 3 players
432715fda1bfd49d40abea9eb01e5a8a2c4b76cb e2d1c1e18df322bb56cdd8ec39129f61c72db8db Elisa Marchione <elisa@yomigatech.com> 1422150451 -0700	pull origin master: Merge made by the 'recursive' strategy.
e2d1c1e18df322bb56cdd8ec39129f61c72db8db 432ee8f0985af5588e2437aae72e27d10f72b27c Elisa Marchione <elisa@yomigatech.com> 1422157340 -0700	commit: Added timer feature to keep track of winning confirm. Fixed last p3 issue.
432ee8f0985af5588e2437aae72e27d10f72b27c 4e427299647bf9b52bb70e64740c4aac2a925d24 Elisa Marchione <elisa@yomigatech.com> 1422157349 -0700	pull origin master: Merge made by the 'recursive' strategy.
4e427299647bf9b52bb70e64740c4aac2a925d24 a4e35ce1c9f8af4ca8163da03e2c75c3b5fe4979 Elisa Marchione <elisa@yomigatech.com> 1422157922 -0700	pull origin master: Fast-forward
a4e35ce1c9f8af4ca8163da03e2c75c3b5fe4979 1d95dd6a7bda9138f6bf5170fcf35add593ccad5 Elisa Marchione <elisa@yomigatech.com> 1422158543 -0700	commit: Added lumberjack image for char
1d95dd6a7bda9138f6bf5170fcf35add593ccad5 626336f02cc2f18b7abe774a6884011f0c7513c1 Elisa Marchione <elisa@yomigatech.com> 1422159076 -0700	commit (merge): Resolved merge conflicts for Mark's file
626336f02cc2f18b7abe774a6884011f0c7513c1 7da1be0816d37944f1554cbbfeb8555baa682cfb Elisa Marchione <elisa@yomigatech.com> 1422162109 -0700	commit: Started work on generating tile map with resources
7da1be0816d37944f1554cbbfeb8555baa682cfb 0e6ab5ae9114919655328c15c84f4312c6acaeef Elisa Marchione <elisa@yomigatech.com> 1422162119 -0700	pull origin master: Merge made by the 'recursive' strategy.
0e6ab5ae9114919655328c15c84f4312c6acaeef 719026ec4675feda6ee25991318c9666c4c5caec Elisa Marchione <elisa@yomigatech.com> 1422162381 -0700	pull origin master: Fast-forward
719026ec4675feda6ee25991318c9666c4c5caec f11b33982d8bec139652b5934d0def551bf813a0 Elisa Marchione <elisa@yomigatech.com> 1422162851 -0700	commit: Fixed filter on map
f11b33982d8bec139652b5934d0def551bf813a0 1227ebbca9bb2150bf1baf531671d3e76d9da212 Elisa Marchione <elisa@yomigatech.com> 1422163831 -0700	commit: Continuing work on the tile map
1227ebbca9bb2150bf1baf531671d3e76d9da212 bc2aba5eb9d6d92aaea93f66475ed176cb8ed597 Elisa Marchione <elisa@yomigatech.com> 1422164313 -0700	commit: Continued work on tile map
bc2aba5eb9d6d92aaea93f66475ed176cb8ed597 389829e95776754e52cfc59eef0432acf49d71e0 Elisa Marchione <elisa@yomigatech.com> 1422164322 -0700	pull origin master: Merge made by the 'recursive' strategy.
389829e95776754e52cfc59eef0432acf49d71e0 ccc303606cec0e7db06a02d2ccbed985643bc7e5 Elisa Marchione <elisa@yomigatech.com> 1422165055 -0700	commit: More work on tile map
ccc303606cec0e7db06a02d2ccbed985643bc7e5 0c56fcd6240af7535b3dc2b8a8c207c5891e8701 Elisa Marchione <elisa@yomigatech.com> 1422165068 -0700	pull origin master: Merge made by the 'recursive' strategy.
0c56fcd6240af7535b3dc2b8a8c207c5891e8701 8ded51db815942aafd83a3d2e5e38a56f0fbae3a Elisa Marchione <elisa@yomigatech.com> 1422166557 -0700	commit: Fixed background map
8ded51db815942aafd83a3d2e5e38a56f0fbae3a 4e9cc415f16b3c3ffb59314d1afb1fb4e62d7d40 Elisa Marchione <elisa@yomigatech.com> 1422166569 -0700	pull origin master: Merge made by the 'recursive' strategy.
4e9cc415f16b3c3ffb59314d1afb1fb4e62d7d40 8f346d410de6a3071a6d6dbf94b393bee86cf7aa Elisa Marchione <elisa@yomigatech.com> 1422166861 -0700	pull origin master: Fast-forward
8f346d410de6a3071a6d6dbf94b393bee86cf7aa aeb315f23846478a0f0f859ad262ba140b804796 Elisa Marchione <elisa@yomigatech.com> 1422167310 -0700	pull origin master: Fast-forward
aeb315f23846478a0f0f859ad262ba140b804796 515de5a7fc4fcf7e2ada4265fa4846ed89cac01f Elisa Marchione <elisa@yomigatech.com> 1422167746 -0700	pull origin master: Fast-forward
515de5a7fc4fcf7e2ada4265fa4846ed89cac01f bff46af85258e53a1433a383ed951727b4aa79b4 Elisa Marchione <elisa@yomigatech.com> 1422168165 -0700	pull origin master: Fast-forward
bff46af85258e53a1433a383ed951727b4aa79b4 1a32648281d585a44938d806fd1a4d84b918ad5a Elisa Marchione <elisa@yomigatech.com> 1422169298 -0700	commit: Fixed location triggers with new width of background
1a32648281d585a44938d806fd1a4d84b918ad5a 5b8605ac5a4334835c87df1601c5d62c2a48da99 Elisa Marchione <elisa@yomigatech.com> 1422170354 -0700	commit: Added basic item
5b8605ac5a4334835c87df1601c5d62c2a48da99 69a435afdd3caf90f1bd1e21a14a22c05e67ada1 Elisa Marchione <elisa@yomigatech.com> 1422170365 -0700	pull origin master: Merge made by the 'recursive' strategy.
69a435afdd3caf90f1bd1e21a14a22c05e67ada1 2c0f2274f1cb44c6410c9f52ca328ff3f1bdd4da Elisa Marchione <elisa@yomigatech.com> 1422170486 -0700	pull origin master: Fast-forward
2c0f2274f1cb44c6410c9f52ca328ff3f1bdd4da 0cbcdf654bf5b9cf755aca020be7a7724d395699 Elisa Marchione <elisa@yomigatech.com> 1422171945 -0700	commit: Started work on multiple backgrounds to choose randomly
0cbcdf654bf5b9cf755aca020be7a7724d395699 f0800ddbbda3293b675850f0535f7faa6c4a5f65 Elisa Marchione <elisa@yomigatech.com> 1422171957 -0700	pull origin master: Merge made by the 'recursive' strategy.
f0800ddbbda3293b675850f0535f7faa6c4a5f65 e106c96fd467b79d04da616904d9ca8d3c345960 Elisa Marchione <elisa@yomigatech.com> 1422172136 -0700	commit: More work on random backgrounds
e106c96fd467b79d04da616904d9ca8d3c345960 b4f801ed10be72a1ef9f2fa26e0181d723002263 Elisa Marchione <elisa@yomigatech.com> 1422172149 -0700	pull origin master: Merge made by the 'recursive' strategy.
b4f801ed10be72a1ef9f2fa26e0181d723002263 3681c982194075961ed1e617852d2c5c42bebf0d Elisa Marchione <elisa@yomigatech.com> 1422174344 -0700	pull origin master: Fast-forward
3681c982194075961ed1e617852d2c5c42bebf0d 588cd1101ccede850364e3e25baae1bf295f0333 Elisa Marchione <elisa@yomigatech.com> 1422174951 -0700	commit: Fixed issue with incorrect audio names and sound function bug
588cd1101ccede850364e3e25baae1bf295f0333 24088a1f7c822ed3bc0af827a1559e40d37cbef2 Elisa Marchione <elisa@yomigatech.com> 1422174967 -0700	pull origin master: Merge made by the 'recursive' strategy.
24088a1f7c822ed3bc0af827a1559e40d37cbef2 9feeff633774831bd4509b742a2ec09793a91fcf Elisa Marchione <elisa@yomigatech.com> 1422201946 -0700	pull origin master: Fast-forward
9feeff633774831bd4509b742a2ec09793a91fcf 437e9561cce50c0c81fb87cf8c725a85e282a877 Elisa Marchione <elisa@yomigatech.com> 1422202247 -0700	commit: Added items on to do list
437e9561cce50c0c81fb87cf8c725a85e282a877 92428c609131232d79647a4108c3d9db0303a8b4 Elisa Marchione <elisa@yomigatech.com> 1422203143 -0700	commit: Started work on changing states for maps
92428c609131232d79647a4108c3d9db0303a8b4 f5f8d019e9d2bf84acc5cc7359e14424bad0de6d Elisa Marchione <elisa@yomigatech.com> 1422203153 -0700	pull origin master: Merge made by the 'recursive' strategy.
f5f8d019e9d2bf84acc5cc7359e14424bad0de6d a0bc8c586b1496c876f346e09cfe92a9b15d4a55 Elisa Marchione <elisa@yomigatech.com> 1422203210 -0700	commit: Fixed Readme extension
a0bc8c586b1496c876f346e09cfe92a9b15d4a55 aa1bb2bedcd4555901fa4947e28ee621ea5b90f1 Elisa Marchione <elisa@yomigatech.com> 1422204764 -0700	merge develop: Fast-forward
aa1bb2bedcd4555901fa4947e28ee621ea5b90f1 892eac54abd8bf18c938b38d66cc02cfbdd40caa Elisa Marchione <elisa@yomigatech.com> 1422217190 -0700	merge develop: Fast-forward
