edit image logo
Merge branch 'dev' of https://github.com/wlynch92/timeframe into dev