Changed website
Merge branch 'master' of https://github.com/jardjys/jardjys.github.io

Conflicts:
	index.html
	solution.html