Change github to world
Merge remote-tracking branch 'github/master'

Conflicts:
	newfile
Add haha to newfile
Fix haha
Merge pull request #1 from Mudenng/beta

Beta