init
Merge branch 'master' of github.com:goshan/poj
merge ignore file