gitignore
update intellij to version 13
Merge branch 'master' of https://github.com/asfer/arch