aaa
ff
Merge branch 'master' of https://github.com/mhjadav/Phonegap

Conflicts:
	index.html