made logo a link for mobile
Merge remote-tracking branch 'origin/wes' into tal
Merge remote-tracking branch 'origin/jeff' into tal
removed merge conflict
fix merge error