anurag_changes
added Caio's Request link
meenakshi changes
Anurag Changes
Merged code Merge branch 'master' of https://github.com/caioddm/TimeTracker

Conflicts:
	code/app/models/user.rb