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
Merge pull request #28 from earthspiritart/master

Fixed slideshow themed controls, added email/newsletter forms
calendar
git merge
git merge master
git merge -m "merging Dave's branch
git commit -m "merging Dave's branch"
Merge branch 'master' of https://github.com/loganwbrown/art_eventz
added art_photo controller
justin deleted pictures
calendar mostly working