made polymorphic picture model, permalink changes in code
modified gitignore for ignoring system file which stores images
master merged, conflicts corrected