asd
adadad
adadad
branch
master
Merge branch 'new'

Conflicts:
	src/conflict
Merge branch 'master' of
https://github.com/WindCalibur/stockwatcher-cs310-.git

Conflicts:
	src/conflict