blah
Merge branch 'master' of https://github.com/animista01/savvy

Conflicts:
	platforms/android/CordovaLib/ant-build/build.prop
	platforms/android/ant-build/HelloCordova-debug-unaligned.apk
	platforms/android/ant-build/HelloCordova-debug.apk
	platforms/android/ant-build/HelloCordova.ap_
	platforms/android/ant-build/build.prop
	platforms/android/assets/www/js/controllers.js
	platforms/android/assets/www/js/services.js
	platforms/android/assets/www/templates/card.html
	platforms/android/assets/www/templates/cards.html
	platforms/android/assets/www/templates/signup.html
Merge branch 'master' of https://github.com/animista01/savvy
.gitignore is now working