user-inf init
update ignore
fix conflict
Merge branch 'master' of https://github.com/cjjlovecjj/user-inf.git