.suo in conflict
using theirs
Added libs folder for sqlite library