I tried to merge Ryan's StraightComfort git repo to mine, and I got a bunch
of conflicts in different areas where I should not touch (like generated
files). I'll just do it manually and upload



On Sat, May 24, 2014 at 6:29 PM, Jun Mark Torii <notifications@github.com>wrote:

> In README.md:
>
> > @@ -1,4 +1,4 @@
> > -StraightComfort-Android
> > +![](https://i.imgur.com/JMvRb9m.png "Straight Comfort - Android")
>
> @RayMo <https://github.com/RayMo> @jsh0211 <https://github.com/jsh0211> I
> just noticed that this is stored in imgur. We may need to change that
> later...
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/JMtorii/StraightComfort-Android/pull/8/files#r13028342>
> .
>