added public_activity gem to gemfile. Generated public_activity migration. Ran rake db:migrate
creates public_activity in users.rb model
created activities index controller
created activities controller
pull origin master
added Preston, Rocco and Erik to contact page
fixed merge conflict
added DPL link to contact page
added fontawesome gylphs, facebook, twitter and github.
removed paragraphs tags from names
Fixed the notifications so that they do not create duplicates and are unique per user.
Solved merge conflicts in Erik's pull request.
Merge branch 'Notifier' into background