Jon1213/activity_app — pull request #11 by mwmckenna (2014-11-24 18:23:08+00:00)
Title: Merged conflicts, deleted tmp and log files

Merged with sufis pages
+ css styling for access and carousel