Bit fucked... going home
app.iml conflict prior to branch pull
Merge branch 'customAdapter' of https://github.com/totallybored/beerarchive