My Attempt
Merge branch 'master' of https://github.com/Andraay/Andraay.github.io

Conflicts:
	DIAMOND-CLICKER/index.html
	DIAMOND-CLICKER/js/app.js