Merge branch 'ignore_intellij_files' into 'master'
[fanfix.git] / .project
2015-03-22 Kevin LamonteTest commit from within Eclipse