classpath
ignore ~.md files
Merge remote-tracking branch 'origin/master'

Conflicts:
	Android/AssetVotesSample/.classpath
	Android/Image Uploader/.classpath