PhoneGap -> Cordova
Merge branch 'master' of github.com:ZeusWPI/zeuswpi

Conflicts:
	www/img/logo.png
	www/index.html