Merge branch 'master' of https://github.com/lucad-advanced-web/danger-birds

Conflicts:
	index.html
troubleshooting

index file is broken; time to edit
Merge branch 'master' of https://github.com/lucad-advanced-web/danger-birds