merge
merge
Placeholders and assets
index fixed for 'hello world'
Merge branch 'development'