Merge remote-tracking branch 'upstream/master'
added lots
removed commented out code
changed readme
added art_photos model
fix merge conflicts
moved some JS files around
commits changed
changed homepage view
fixed merge conflicts
changes
fixed merge conflicts
nested forms are stupid
all
added art_photo controller
justin deleted pictures
resolved merge conflicts