ae
ijeiajelsjglseijg
Merge branch 'master' of git://github.com/n2d8/test

Conflicts:
	stockwatcher/StockWatcher/New Text Document.txt

i solved it lol