ignore ds_store
app structure. placeholders for models, views, templates, static assets.
Merge remote-tracking branch 'origin/master'