generated erd
added comments for some gems
bootstrap- added sticky footer
added friendships
removed unecessary devise views
moved bootstrap to vendor
moved bootstrap to vendor
moved bootstrap to vendor
moved bootstrap to vendor
no changes
merge conflict
moved bootstrap to vendor
moved bootstrap to vendor
no changes
merge conflicts...
moved bootstrap to vendor
moved bootstrap to vendor
no changes
merge
connected the editors