crap

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

Conflicts:

	SimpleStocks/app/src/main/java/com/simplestocks/simplestocks/MyActivity.java