no idea what I'm doing here
Merge branch 'master' of ssh://git@github.com/smarkren/test1.git
Merge branch 'master' of ssh://git@github.com/smarkren/test1.git
Altered the console info statement to output what I'm listening to
Merge branch 'master' of ssh://git@github.com/smarkren/test1.git

Conflicts:
	js/script1.js