Merge branch 'master' into thorBranch
teams svg
thor: SVG files
Merge branch 'thorBranch'

Conflicts:
	.DS_Store
moved files into assets
Merge branch 'master' into gh-pages