Merge branch 'master' of https://github.com/collinlane/imDown

Conflicts:
imDown/en.lproj/Public.xib