oiu
Merge branch 'master' of https://github.com/uradix14/PhoneGap

Conflicts:
	index.html