stash
Merge branch 'master' of git://github.com/ericlee0492/stockprophit

Conflicts:
	java_project/bin/classes/com/example/stockprophit/DisplayMessageActivity.class
	java_project/bin/classes/com/example/stockprophit/MainActivity.class
test update
Merge branch 'master' of git://github.com/ericlee0492/stockprophit