fixing error on home page
Merge branch 'master' into avi
testing error fix
Merge branch 'avi'
fixing previous homepage error
Merge branch 'master' into alan
checking out user paths from alan
fixing login errors