added paypal donate button
fixed git ignore conflict