more conflicts
Merge branch 'master' of github.com:aluong91/cse190
error throwing google analytics stuff