my broken stuff
Merge branch 'develop' of https://github.com/Make-Magazine/makerapp into develop

* 'develop' of https://github.com/Make-Magazine/makerapp:
  moving these styles
  image size