update of product locations and user names
Merge branch 'master' of https://github.com/tommaton/battlehack
Merge branch 'master' of https://github.com/tommaton/battlehack
resize of images
Merge branch 'master' of https://github.com/tommaton/battlehack