committed
git commit -a -m committed
git commit -a -m committed
gg
Merge branch 'master' of https://github.com/cooleo400/wheresthesub

Conflicts:
	platforms/ios/cordova/console.log