bootstrap- added sticky footer
Merge pull request #9 from blairprophett/master

bootstrap- added sticky footer
generated erd
added comments for some gems
added friendships
Merge pull request #10 from stevenmiller888/friend_feature

Friend feature
removed unecessary devise views
Merge pull request #11 from blairprophett/master

removed unecessary devise views
moved bootstrap to vendor
moved bootstrap to vendor
no changes
merge conflict