deleting sprockets
Merge pull request #11 from mwmckenna/master

Merged conflicts, deleted tmp and log files
fixing conflicts
mid-fix for making home to carousel work; dont want to conflict with Sufi code
make all the paths work
fixed input text color added logo pulling images from db
fixed image conflict in activities index