Initial commit
Added xcodeproj file
Fixed merge conflict