finito
Merge remote-tracking branch 'origin/peterMaster' into populateAlex

Conflicts:
	SimpleStocks/app/app.iml
	SimpleStocks/app/build.gradle
	SimpleStocks/app/src/main/java/com/simplestocks/simplestocks/MyActivity.java