did a bunch of stuff
Merge branch 'master' of git://github.com/dgl2311/StocksWithFriends