update 1
what the fuck am I doing
w/ tests for graph

w/ tests for graph
Fuck what I am the doing
fuck... something
Revert "fuck... something"

This reverts commit db726660176a5fdf7cf1cba890843e0f84bf5a66.
Revert "Revert "fuck... something""

This reverts commit f3115c9bdeba9a1a7c0e1dd3342573825e57d37a.
Merge remote-tracking branch 'origin/master' into alexBranch

Conflicts:
	SimpleStocks/app/src/main/java/com/simplestocks/simplestocks/MyActivity.java
Merge remote-tracking branch 'origin/alexBranch' into michaelBranch

Conflicts:
	SimpleStocks/app/src/main/java/com/simplestocks/simplestocks/MyActivity.java
	SimpleStocks/app/src/main/res/layout/activity_my.xml