Merge branch 'master' of https://github.com/PattyW/Lab2.git
Merge branch 'carmen'
Edited stockPrice.java
changed stockprice for merge
fixed merge conflict
changed logininfo.java
undid change to logininfo.java