ignore eclispe files
Merge branch 'origin/master'