Merge remote-tracking branch 'origin/master'
add layout haml file
Rename file
add template files