DIAMONDS
Merge remote-tracking branch 'origin/master'

Conflicts:
	DIAMOND-CLICKER/index.html
Merge branch 'master' of https://github.com/Andraay/Andraay.github.io