added dist to git ignore
merging layout into master