Merge branch 'master' into alexisBranch
Merge branch 'master' into alexisBranch
button issues fixed
team pages updated
remove animation
jared's animations
Merge branch 'alexisBranch'