New approach.
Merge branch 'master' of https://github.com/Horrowind/mockup

Conflicts:
	.gitignore
Commit .gitignore
Merge branch 'master' of https://github.com/Horrowind/mockup

Conflicts:
	.gitignore