Merge remote-tracking branch 'upstream/master'
Removed eclipse settings files that were checked in.
Merge pull request #13 from sjlee/sjlee-eclipse-fix

Removed eclipse settings files that were checked in