Edited readme
Merge branch 'master' of github.com:ozzyoli/opencv_gsoc

Conflicts:
	MarkerlessARForAndroid/assets/readme.html