Removed accidentally included diff 'file'.
Merge branch 'master' of http://github.com/ProjectNami/projectnami