testing and libs'
'
Merged all the layout templtes into one
Deleted old templates that were merged