gitignore
Merge branch 'master' of github.com:wazones/yo-reporto-app
change
windows bats
format
Merge branch 'master' of github.com:wazones/yo-reporto-app

Conflicts:
	platforms/android/assets/www/index.html
	platforms/android/assets/www/js/graphs.js
	platforms/android/assets/www/js/main.js
	platforms/android/assets/www/js/mapfunctions.js
	platforms/android/assets/www/js/twitter.js
	www/index.html
	www/js/main.js
	www/js/mapfunctions.js
	www/js/twitter.js
primera aproximacion diagrama de torta