a
k
Merge remote-tracking branch 'origin/master'

Conflicts:
	Juan Carlos/MagicBall/index.html