modified StockPrice
changed StockPrice in master
changed StockPrice in patty branch
changed StockPrice.java
changed StockPrice.java
changed StockPrice.java
Merge branch 'master' of https://github.com/PattyW/Lab2
modified README.txt
Merge branch 'carmen' into patty
Merge branch 'patty'
Merge branch 'master' of https://github.com/PattyW/Lab2
pushing from local
Merge branch 'master' of https://github.com/PattyW/Lab2.git
Master catch up to my local/master
Merge branch 'carmen'
Edited stockPrice.java