Initial commit
Solved conflict
Added lib ignores as well