Can now add a logo to a picture.

Only logo right now is nike. Need to make it so logo selection is based
on company tag. Need to improve UI for logo placement and adjustment.
Merge branch 'master' of https://github.com/maplesyrup/maple-android
Merge pull request #33 from elihart/master

Added basic logo functionailty.