Added favorite teams page
Merge origin/master