Deleted merge
Revert "Deleted merge"

This reverts commit 002be1c2a29283747d5a6250bdf2d5212e29414d.
Revert "Revert "Deleted merge""

This reverts commit 6548fe09a61cafa6e3f98e0087d925546481a452.
Merge remote-tracking branch 'origin/master'

Conflicts:
	about.html