ignoring .map files
ignoring .map files
ignoring .map files
updated readme
merge branches
merge config.codekit
merge