added ignore
Merge branch 'master' of https://github.com/jameswang14/esupport

Conflicts:
	platforms/ios/www/page.html
	www/page.html