post presentation merge
Merge branch 'master' of https://github.com/ericlee0492/stockprophit

Conflicts:
	java_project/bin/LoginActivity.apk
	java_project/bin/classes.dex
	java_project/bin/classes/com/example/stockprophit/FavoritesActivity.class
	java_project/bin/classes/com/example/stockprophit/MainActivity.class
	java_project/bin/resources.ap_
Merge branch 'master' of https://github.com/ericlee0492/stockprophit