move all intellij project files off the ignore list
Merge remote branch 'origin/master'