Deleted different stuff
Merge branch 'kyle'
Restored Original StockWatcher.

You guys should edit this stuff in a text editor rather than Eclipse. We're just making merges, not actually trying to run the thing.
Added a text file for us to screw with. easier than going all the way to a java file
Added my line