ready to heroku
ready to heroku
update ex.crx
package files
test
Merge branch '1.1' of https://github.com/dsmiller/DayReel into 1.0.1

Conflicts:
	log/development.log
	log/production.log
	tmp/cache/assets/BC7/0C0/sprockets%2F426337875517219d812e170b528c6690
	tmp/cache/assets/C12/DF0/sprockets%2Fcd34d454d93644ec1240290660019522
	tmp/cache/assets/C29/8A0/sprockets%2Fa899e19256a0845205636938010c6fe5
	tmp/cache/assets/C31/5C0/sprockets%2F343d414d066b006133081bb137b8325c
	tmp/cache/assets/C44/010/sprockets%2Fe656645f330b3c6b1d38237d13381205
	tmp/cache/assets/C46/740/sprockets%2F0a5422da289237b0583c77327717e0d1
	tmp/cache/assets/C53/FC0/sprockets%2F67b2b6c3a2d9575c90698d1301131679
	tmp/cache/assets/C62/1D0/sprockets%2F1638f87db345b13872695759502b54fe
	tmp/cache/assets/C6D/430/sprockets%2F66d303d2d9100152056f2ac9f3741b17
	tmp/cache/assets/C76/240/sprockets%2F88d25eee4a74694f993508a377269927
	tmp/cache/assets/C79/D60/sprockets%2F84a503f45390c8b247d446c6c330046e
	tmp/cache/assets/C7A/170/sprockets%2Ff1663d34d4b6003379113df98f1433a5
	tmp/cache/assets/C7E/210/sprockets%2F9a8112963f7256f10baeea6904627045
	tmp/cache/assets/C7E/2D0/sprockets%2F21b8a641f40961c06592e86a5c199a24
	tmp/cache/assets/C88/1D0/sprockets%2F2774284ff074438dca76d38068b411f4
	tmp/cache/assets/C9F/560/sprockets%2F8e5a9738e9bc15478e026d98335454f9
	tmp/cache/assets/CA0/DB0/sprockets%2Fb8d42949e061501a753d0e3a8be12522
	tmp/cache/assets/CA2/8F0/sprockets%2F60de970c061969402e5b5d21d2631cb2
	tmp/cache/assets/CAB/080/sprockets%2Fddb26871e1ab671c60ae619859231353
	tmp/cache/assets/CAB/7B0/sprockets%2F4a80f1739cf8872553422b08cad219c0
	tmp/cache/assets/CAF/BA0/sprockets%2F9d73e7881c13e205bf706e0114f3e806
	tmp/cache/assets/CB6/A90/sprockets%2Fcce82939f86b8516697e1f789f147899
	tmp/cache/assets/CBE/590/sprockets%2Fa548176eb14e2da14b2422020e2b3d16
	tmp/cache/assets/CC0/5C0/sprockets%2Fca241e9f1a1b8285081d0b1442d520a3
	tmp/cache/assets/CC1/060/sprockets%2Ff4690fe34d75c65295b72391e358dc17
	tmp/cache/assets/CC1/340/sprockets%2F51e8a6329c979c797baa9f418223c391
	tmp/cache/assets/CC4/D70/sprockets%2F07f4ae08ea1ea2027362ac0645570a06
	tmp/cache/assets/CD7/FD0/sprockets%2F28f21173fe3e7057c9820aba2277e00f
	tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/CD8/590/sprockets%2Fa69c7cd6a12d4433ad803f564838c013
	tmp/cache/assets/CDA/3D0/sprockets%2F3d537e266c2d3dd7b1131f18f463b680
	tmp/cache/assets/CDA/550/sprockets%2F59c4c7953d16d57ce6d6c937997d6954
	tmp/cache/assets/CDB/910/sprockets%2F26098b294d10eec3e946bb124334e5e4
	tmp/cache/assets/CDF/530/sprockets%2F9be77f61c1c5c2c7145303188836ac2e
	tmp/cache/assets/CE5/370/sprockets%2F84c9f644a1a775b0c779a904b08319bd
	tmp/cache/assets/CE5/410/sprockets%2F71f8e9d2da27321d52e991fb42135f74
	tmp/cache/assets/CE9/CB0/sprockets%2F93ad955097c9a53b62a321a694ce729e
	tmp/cache/assets/CEB/CC0/sprockets%2F7fd1d9a9d771ead1e835047e96635402
	tmp/cache/assets/CED/9A0/sprockets%2F66867707d10e41a97d25ce7d945f42db
	tmp/cache/assets/CF2/010/sprockets%2F7be9086c960bb4384c9d23a52e489f29
	tmp/cache/assets/CF3/5E0/sprockets%2F6f2c766c9ee7519224d5d71da9e57821
	tmp/cache/assets/CFA/C50/sprockets%2F464f1f1a555ca32343de3b1149b524bc
	tmp/cache/assets/CFF/C20/sprockets%2F2735e99c96229dc99545531dff6b2cf9
	tmp/cache/assets/D07/070/sprockets%2F27c550e387d67232e57ca0c6ecb73a12
	tmp/cache/assets/D08/620/sprockets%2Fe4ee62eb87122bef34459390a47ca310
	tmp/cache/assets/D0A/1C0/sprockets%2F6d5be16ffec28a000b999f070d980201
	tmp/cache/assets/D0B/4F0/sprockets%2Fb24690439218fa79ba2fb7307ca3e74a
	tmp/cache/assets/D0D/DE0/sprockets%2F4834db22221bec241ff18787d6a65ec5
	tmp/cache/assets/D0E/980/sprockets%2F39c3d3bb21fdc06992a93d4f0725383d
	tmp/cache/assets/D0F/F30/sprockets%2F1d527656a9be03a7cbf9a912862d62e1
	tmp/cache/assets/D17/4C0/sprockets%2F700827acd727b6fc8361f454c68a5cd7
	tmp/cache/assets/D18/3B0/sprockets%2Fc8ac3f6122c87a53921c3f88d0c9568c
	tmp/cache/assets/D1A/3B0/sprockets%2Fb8db2ece531d7e8737245f980208ea74
	tmp/cache/assets/D1B/750/sprockets%2F4b12eb789b25d374f89481e5e0722ecf
	tmp/cache/assets/D1B/F50/sprockets%2Fc89eb19bef627cd91066552a64629b6a
	tmp/cache/assets/D20/D00/sprockets%2Fb5621b50f9795cf8737d7ae5e06c95b3
	tmp/cache/assets/D22/C70/sprockets%2F44948e8bf8e38828ccf0b155e3ba2767
	tmp/cache/assets/D26/180/sprockets%2F87e8e7a2ff2194b91f3830a93894ec3f
	tmp/cache/assets/D29/130/sprockets%2Fd51e298a550bb340f45f0d0c40f30e1f
	tmp/cache/assets/D2A/6D0/sprockets%2Fbb72fbcb5a533a2d61178c87ab353104
	tmp/cache/assets/D2B/C30/sprockets%2F09aa5ad426acc1e731020e8b75e185d2
	tmp/cache/assets/D2F/AD0/sprockets%2Fa85d3a8a48aa75af9c20cc201480760c
	tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/D34/0F0/sprockets%2F12054f814b0c96a2f2f8d15d93ea33bd
	tmp/cache/assets/D35/770/sprockets%2F5f3c55bfbf6093fa428a3ad7012b4059
	tmp/cache/assets/D3A/2E0/sprockets%2Fa7d5910b169c43aad514b7990c961cae
	tmp/cache/assets/D3D/200/sprockets%2F0100854a44ce640a6e759ed8fa6c5c5e
	tmp/cache/assets/D3D/650/sprockets%2F15119006c69e3b7f9f2bd390fba5d36c
	tmp/cache/assets/D3E/AD0/sprockets%2F440a258acf52af5c39846565c3ede43a
	tmp/cache/assets/D42/E80/sprockets%2F2117ecf29d9b73ba60db96fc9510248e
	tmp/cache/assets/D45/FB0/sprockets%2Ff81973c3204a2ccaae9b515f2c9e6598
	tmp/cache/assets/D49/210/sprockets%2Fc55d8ab82077a996076e608ad20dfe9a
	tmp/cache/assets/D4D/A50/sprockets%2F6547bcbc91af921b85c3b80a9d58992f
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D4E/4A0/sprockets%2F86c238c8989b1420c9efc5fd484ba8b0
	tmp/cache/assets/D4E/7D0/sprockets%2Ff892b098994d84cc876f15f30ae0d2ac
	tmp/cache/assets/D4E/B70/sprockets%2Fc620d7993cfa02572f5c6886ebf6d1c8
	tmp/cache/assets/D51/B60/sprockets%2F2a04e040a221f42ef7cc4f31bbf1c807
	tmp/cache/assets/D53/7E0/sprockets%2F8795d017881bdbcf98f69668daab2d22
	tmp/cache/assets/D55/C70/sprockets%2F8a36fc33ec57af735e6d565d953c3d88
	tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/D5C/E50/sprockets%2F7ffc2cb85a0a36c6b941c013dc2a5363
	tmp/cache/assets/D62/210/sprockets%2F0c9f5a68e10c76b2d39acc37bb242e22
	tmp/cache/assets/D64/320/sprockets%2F446e7fa8a1fc2bb4e8154c070a88c20c
	tmp/cache/assets/D67/E10/sprockets%2F6ecd3edfd320373e69b80a1b6508cb61
	tmp/cache/assets/D68/590/sprockets%2Faff419935421b795cf15a2e2c1deaa46
	tmp/cache/assets/D68/7D0/sprockets%2F97ba560d414fa1a22f99166c4a2f6bcd
	tmp/cache/assets/D69/6E0/sprockets%2F7e2d33eca4423fd061dd3a686c4f42e6
	tmp/cache/assets/D69/A40/sprockets%2Fb0e05568bc7f3a6d38b3e5ea2da83264
	tmp/cache/assets/D70/680/sprockets%2F5aea6684aee62c1722f0c51b17b988df
	tmp/cache/assets/D70/A60/sprockets%2F388143de84bd4b28c830914baeffdf13
	tmp/cache/assets/D73/ED0/sprockets%2F1f564fff5ec52d16f6ee311d90460be7
	tmp/cache/assets/D78/3D0/sprockets%2F7813dc58c97ce9a45a7bc1d65c7a28a4
	tmp/cache/assets/D7C/DA0/sprockets%2F315d5f28858a1fed71be9824a5ff1d5f
	tmp/cache/assets/D7D/160/sprockets%2F23ad466a8dff876186ebec3b1c78e581
	tmp/cache/assets/D7F/F90/sprockets%2F969e07c7b3d4a8919b4faf7806d1ddf1
	tmp/cache/assets/D80/230/sprockets%2Fef623338b9a1808ebf0fa67f767f81cf
	tmp/cache/assets/D82/1A0/sprockets%2Fb65df922e4e31bbe935a87f85d6f728b
	tmp/cache/assets/D82/4E0/sprockets%2F900dac37c6a4d0822afc23e47020dcad
	tmp/cache/assets/D82/7D0/sprockets%2F982c09ed97f3948fd8a3ddb07f1cb166
	tmp/cache/assets/D8A/EB0/sprockets%2Fd114bec655aa3175f21c94cd2d32aab9
	tmp/cache/assets/D94/C60/sprockets%2Fd264c9c681de2cca23e8e07d5cc301f1
	tmp/cache/assets/D95/BC0/sprockets%2F4ea33e825e6e38bd22dccab488a0255b
	tmp/cache/assets/D98/B80/sprockets%2Feeeb39bc28e0081a8c07ba5b007984ed
	tmp/cache/assets/D9D/500/sprockets%2Fd678e28e29b1d9ec70f2205a85abb4ca
	tmp/cache/assets/D9D/B90/sprockets%2F1ac58c6d6015fa9d5ca8d3e1c6f0474f
	tmp/cache/assets/DA2/550/sprockets%2Fee8778e0907371f17fe3eaccb3aaf063
	tmp/cache/assets/DA2/BE0/sprockets%2F9938c2dddb20381ee92f3ae7d0a9a5d5
	tmp/cache/assets/DA3/5F0/sprockets%2F0f8983bd11ed2e228e674afcbd8427db
	tmp/cache/assets/DA4/D80/sprockets%2F610a5b7498e7a8ee7a38ebcfb360a4c8
	tmp/cache/assets/DA5/FB0/sprockets%2Ff644fd75cbead0e58c847aa16546e2a8
	tmp/cache/assets/DA6/C10/sprockets%2F9078fcc8fbc7b39666b5be1b09a145dc
	tmp/cache/assets/DA7/E60/sprockets%2Ff59f3c4918abf029cad6857ed125efb1
	tmp/cache/assets/DA7/FC0/sprockets%2Fe3c62c7eaf87f0d5b3b5c75f208848cb
	tmp/cache/assets/DB0/BD0/sprockets%2F3adc9ce7fd4cb52e39591fa0881db997
	tmp/cache/assets/DB8/360/sprockets%2Fd6e174f9bde4ec5992e1f365bd6f647e
	tmp/cache/assets/DC4/3D0/sprockets%2Fdbad5f5ed69eb23947e42a0e14cea240
	tmp/cache/assets/DC5/DB0/sprockets%2Fd0af0dc5c4a7f1ff3624e5f32a4b8e44
	tmp/cache/assets/DC7/730/sprockets%2Fb7545da074ee78bbb5db6df0e04a73f0
	tmp/cache/assets/DC9/430/sprockets%2F1bcadbd6fcc9c9e240452a17bae79383
	tmp/cache/assets/DCB/9D0/sprockets%2F3a8cde84ea8d6e1c00ec36f050fe7a92
	tmp/cache/assets/DCD/730/sprockets%2Fb2aae44d1be76589f5f4a197c5a4cfa1
	tmp/cache/assets/DCD/9F0/sprockets%2Fa66e0fa19923eda9dbfdd57f029b1b07
	tmp/cache/assets/DCF/DB0/sprockets%2Fe751b55b74dbd2ab5f47d8adf644ac64
	tmp/cache/assets/DD3/1D0/sprockets%2F85944cda70f26cadfe900bd20787eded
	tmp/cache/assets/DD7/950/sprockets%2F3665aa30fefe8e40fe1f86cc5f90de35
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/DE3/0B0/sprockets%2F4387af666edf5adee779706bfae20c8f
	tmp/cache/assets/DF8/030/sprockets%2Fcbe15f8acaa43ae00df897a6b41f376e
	tmp/cache/assets/E02/0A0/sprockets%2Fbf323dfd1f9a51d61fe475be1f7c8d6a
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/E0E/060/sprockets%2F192d8cabe316e51d8913bdfff8f9bee6
	tmp/cache/assets/E27/B90/sprockets%2Fca04cc7fe5112f63f82abbff506cdf8b
	tmp/cache/assets/E2B/FD0/sprockets%2Fb51c1a5bdd909f9aff1cafa770d1df84
	tmp/cache/assets/E4E/8F0/sprockets%2F0dbcd1ebfc662f1bc23e47653a5dfbcb
	tmp/cache/assets/E68/310/sprockets%2Fb3edd939cee5fe55723d16ec6ead4dcd