merge
merge
added first version of heroes_layout
merge