Minor fixes
Merge https://github.com/JonathanOv/PenO3
Merge https://github.com/JonathanOv/PenO3

Conflicts:
	web/script.js
Merge https://github.com/JonathanOv/PenO3
Pictures
Merge https://github.com/JonathanOv/PenO3

Conflicts:
	web/script.js