kylefinalize
Changes to activity feed & comments
fixed erics merge
kyles integrated
cleaned up the file directory