modified README.txt
changed StockPrice.java
Merge branch 'carmen' into patty
Merge branch 'patty'
pushing from local
Master catch up to my local/master