Merge pull request #52 from ilanasufrin/emily

Emily
minor changes to nav bar since ben is getting errors
Failed attempts to get cron jobs with whenever working
Fixed merge conflicts
Merge pull request #53 from ilanasufrin/ben_branch

Ben branch
Merge pull request #54 from ilanasufrin/emily

updates 'stalk' to 'follow', about to fix my distance bug
fooling around with styling
Merge branch 'master' of github.com:ilanasufrin/friendStalker
updates friend location data type from float to string for user show page