Added settings funcionality
Added settings.cpp
Conflict resolution