update
Merge branch 'master' of https://github.com/SeekArt/android_iphone

Conflicts:
	index.html