ignore xcodedate
Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	proj.ios_mac/Programmers Guide.xcodeproj/project.xcworkspace/xcshareddata/Programmers Guide.xccheckout
Merge pull request #4 from andyque/master

add gitignore