Merge branch 'master' into erikBranch
Merge branch 'master' into thorBranch
merge
git ignore
ignore
link to playbook start page
teams svg
thor: SVG files
Playbook
Merge branch 'thorBranch'

Conflicts:
	.DS_Store
moved files into assets
Merge branch 'master' into erikBranch
style added
Merge branch 'master' into alexBranch

Conflicts:
	.DS_Store