Changed euro to dollar, added about us
Fixed conflicts