Adding project
Update ignore
Fix conflict