woohoo
WOOHOO
--
Merge remote-tracking branch 'origin/peter' into alexTablePopulate

Conflicts:
	SimpleStocks/app/src/main/java/com/simplestocks/simplestocks/MyActivity.java
Revert "WOOHOO"

This reverts commit 3826185b0f62a1342492de142d64924b57a729f2.
This work 100%
Fixed crash when back out
Added pound sign
this wrong
Merge remote-tracking branch 'origin/alexTablePopulate' into alexTablePopulate

Conflicts:

	SimpleStocks/app/src/main/java/com/simplestocks/simplestocks/MyActivity.java
Fixed readjustment of buttons
Fixed silliness
crap

crap#
Merge remote-tracking branch 'origin/alexTablePopulate' into alexTablePopulate

Conflicts:

	SimpleStocks/app/src/main/java/com/simplestocks/simplestocks/MyActivity.java
crap
still crap
wtf
HopefullyFixed