Merge branch 'asket'
Updated gitignore

Should ignore both eclipse and intellij
Merge branch 'master' into asket