Merge remote-tracking branch 'origin/master'

Conflicts:
	images/Thumbs.db
	img/Thumbs.db
Merge branch 'master' of https://github.com/Onaga/Webpage-beta

Commit