Inheritance and layout for items
Merge branch 'master' of https://github.com/NikolaMaster/My_project

Conflicts:

	modified:   script.js