restarting from scratch
Merge branch 'source' of github.com:xplayer/xplayer.github.com into source

Conflicts:
	_config.yml