Merge branch 'patch-1' into 'master' Update .gitignore (added codekit config file) See merge request makerlog/web!3