Add world-lib.
Change .gitignore
Merge branch 'master' of https://github.com/Horrowind/mockup

Conflicts:
	.gitignore