syncing sanan
Merge branch 'master' of github.com:rugbyprof/Aii

Conflicts:
	careTeam/js/app.js
Travis Changed Sanan
Fixing broken pages
Merge branch 'SananBranch'

Conflicts:
	careTeam/js/app.js
Finally Sanans stuff works
Added logic controller for login
get data