0000000000000000000000000000000000000000 a0bc8c586b1496c876f346e09cfe92a9b15d4a55 Elisa Marchione <elisa@yomigatech.com> 1422203305 -0700	branch: Created from master
a0bc8c586b1496c876f346e09cfe92a9b15d4a55 aa1bb2bedcd4555901fa4947e28ee621ea5b90f1 Elisa Marchione <elisa@yomigatech.com> 1422204728 -0700	commit: Back to non-crashing state
aa1bb2bedcd4555901fa4947e28ee621ea5b90f1 e6b6e6d46d2b9ffe5be38c71e04617cd002030db Elisa Marchione <elisa@yomigatech.com> 1422205569 -0700	commit: Further work on states
e6b6e6d46d2b9ffe5be38c71e04617cd002030db dd0e2dbcb418947514192dcc8ca222754f8f873d Elisa Marchione <elisa@yomigatech.com> 1422205598 -0700	pull origin develop: Merge made by the 'recursive' strategy.
dd0e2dbcb418947514192dcc8ca222754f8f873d ace1c705a8848b1d450b9bb7d7b46b397e2cb103 Elisa Marchione <elisa@yomigatech.com> 1422207894 -0700	commit: Got states working for map generation. Added party confirmation sound
ace1c705a8848b1d450b9bb7d7b46b397e2cb103 82a29b027fe5015da39b3c3822467b788f1c47be Elisa Marchione <elisa@yomigatech.com> 1422207911 -0700	pull origin develop: Merge made by the 'recursive' strategy.
82a29b027fe5015da39b3c3822467b788f1c47be 07ed83658c31fa6ae2eaecb64719b67773c0a6bc Elisa Marchione <elisa@yomigatech.com> 1422211948 -0700	commit: Updated map switching. Started work on item pickups.
07ed83658c31fa6ae2eaecb64719b67773c0a6bc 9e68d8a96a5f0e17af0bf72bfd5e9080dea9d604 Elisa Marchione <elisa@yomigatech.com> 1422211964 -0700	pull origin develop: Merge made by the 'recursive' strategy.
9e68d8a96a5f0e17af0bf72bfd5e9080dea9d604 104f5fb01ca92c21da6c50d38f8e61620f97dded Elisa Marchione <elisa@yomigatech.com> 1422212935 -0700	commit: Added menu song and changed volume
104f5fb01ca92c21da6c50d38f8e61620f97dded da4260bd91bbee0f78333d13353beccf50ff7164 Elisa Marchione <elisa@yomigatech.com> 1422212948 -0700	pull origin develop: Merge made by the 'recursive' strategy.
da4260bd91bbee0f78333d13353beccf50ff7164 55ad2e5766e0454747053be163024981714b7b2d Elisa Marchione <elisa@yomigatech.com> 1422213640 -0700	commit: Improved audio for menu song and ambient
55ad2e5766e0454747053be163024981714b7b2d df890ad15c745fa9bfde3b31c1f612083bef4c3b Elisa Marchione <elisa@yomigatech.com> 1422213658 -0700	pull origin develop: Merge made by the 'recursive' strategy.
df890ad15c745fa9bfde3b31c1f612083bef4c3b 892eac54abd8bf18c938b38d66cc02cfbdd40caa Elisa Marchione <elisa@yomigatech.com> 1422217149 -0700	commit: Added packaged love executable in releases directory
892eac54abd8bf18c938b38d66cc02cfbdd40caa bf6c429e21fb80d53838ee14905055682dce763e Elisa Marchione <elisa@yomigatech.com> 1422222502 -0700	commit: Worked on comfort token decreases
bf6c429e21fb80d53838ee14905055682dce763e 7dc670a2b3cead8b1d5ab7df8ecbf7b1f525e97b Elisa Marchione <elisa@yomigatech.com> 1422222512 -0700	pull origin develop: Merge made by the 'recursive' strategy.
7dc670a2b3cead8b1d5ab7df8ecbf7b1f525e97b afc4bc9ebef15c761977278114a6c3f6641d875d Elisa Marchione <elisa@yomigatech.com> 1422224741 -0700	commit: Worked on token decrease:
afc4bc9ebef15c761977278114a6c3f6641d875d c98415a333dfde0fba4a116fd626df43dde765d4 Elisa Marchione <elisa@yomigatech.com> 1422224770 -0700	pull origin develop: Merge made by the 'recursive' strategy.
c98415a333dfde0fba4a116fd626df43dde765d4 aa086522a653807a2ef2c24cd3ecb3d783e94788 Elisa Marchione <elisa@yomigatech.com> 1422225699 -0700	commit: Added commit file
aa086522a653807a2ef2c24cd3ecb3d783e94788 8340cd6678a64471c3496485d82514327a15cc62 Elisa Marchione <elisa@yomigatech.com> 1422227395 -0700	commit: Added random location for item generation.
8340cd6678a64471c3496485d82514327a15cc62 7ef0ae49c50e65bdbfa900fad19f8303165ff7b1 Elisa Marchione <elisa@yomigatech.com> 1422227410 -0700	pull origin develop: Merge made by the 'recursive' strategy.
7ef0ae49c50e65bdbfa900fad19f8303165ff7b1 5937edeb508e67380e5d023851509e284630da0f Elisa Marchione <elisa@yomigatech.com> 1422228767 -0700	pull origin develop: Fast-forward
5937edeb508e67380e5d023851509e284630da0f 7e06c0540ba5da0973bd61ebf5473c1c0932b879 Elisa Marchione <elisa@yomigatech.com> 1422229832 -0700	pull origin develop: Fast-forward
7e06c0540ba5da0973bd61ebf5473c1c0932b879 5cb7893e20e95db6aed76431a1d8fcc28667b2b4 Elisa Marchione <elisa@yomigatech.com> 1422230337 -0700	pull origin develop: Fast-forward
