Initial commit
IntelliJ IDEA 14.0.2 <zhou@zhou-osx.engr.wavemarket.com Create webServers.xml, project.default.xml, vcs.xml, path.macros.xml, notifications.xml, filetypes.xml, file.template.settings.xml, template.settings.xml, other.xml, Default.xml, JavaScript File.js, ide.general.xml, debugger.renderers.xml, web-browsers.xml, Default _1_.xml, debugger.frameview.xml, AMD JavaScript File.js, code.style.schemes.xml, abbreviations.xml, Deployment.xml, TypeScript File.ts, colors.scheme.xml, File Header.java, keymap.xml, mavenVersion.xml, git.xml, find.xml, proxy.settings.xml, toStringTemplates.xml
IntelliJ IDEA 14.0.2 <zhou@zhou-osx.engr.wavemarket.com Create databaseDrivers.xml
PyCharm 4.0.2 <zhou@zhou-osx.engr.wavemarket.com Update other.xml, project.default.xml, path.macros.xml, code.style.schemes.xml, Default.xml, notifications.xml, filetypes.xml, ide.general.xml, find.xml	Create editor.codeinsight.xml, packages.xml, removedInterpreters.xml, ui.lnf.xml
PyCharm 4.0.3 <zhou@zhou-osx.engr.wavemarket.com Update filetypes.xml	Create git.xml, path.macros.xml, laf.xml, IntelliLang.xml, options.xml
PyCharm 4.0.3 <zhou@zhou-osx.engr.wavemarket.com Update notifications.xml
Initial commit
Merge branch 'master'

Conflicts:
	README.md
PyCharm 4.0.3 <zhou@zhou-osx.engr.wavemarket.com Update other.xml, laf.xml, options.xml
Reset to https://github.com/zhoulijoe/pycharm_setting.git
PyCharm 4.0.3 <zhou@zhou-osx.engr.wavemarket.com Create webServers.xml, project.default.xml, web-browsers.xml, Default _1_.xml, path.macros.xml, editor.codeinsight.xml, code.style.schemes.xml, notifications.xml, filetypes.xml, ui.lnf.xml, options.xml, Deployment.xml, colors.scheme.xml, other.xml, git.xml, laf.xml, keymap.xml, Default.xml, packages.xml, removedInterpreters.xml, IntelliLang.xml, find.xml, ide.general.xml, proxy.settings.xml