Merge branch 'master' into alexisBranch
Merge branch 'gh-pages'
embedding pages
Merge branch 'gh-pages'

Conflicts:

lib/css/.sass-cache/1929c2990c95295c8085ce2cf39273d95ea6e2a9/_teams.scss
c

lib/css/.sass-cache/1929c2990c95295c8085ce2cf39273d95ea6e2a9/_theme.scss
c
	lib/css/style.css.map
Merge branch 'master' into alexisBranch
button issues fixed
team pages updated
remove animation
jared's animations
Merge branch 'alexisBranch'
Merge branch 'master' into gh-pages