bit of refactoring
stalking text changes on click, still has submit for each friend and only persists on submit
resolves merge conflicts
Merge pull request #52 from ilanasufrin/emily

Emily
minor changes to nav bar since ben is getting errors
Fixed merge conflicts