3rd-deploy
Merge branch 'master' of https://github.com/theredfoxfire/wedusflare

Conflicts:
	index.php