Getting there!!!! Thank you Jesus!
	modified:   salamander.c
Merge branch 'master' of http://github.com/haxworx/Salamander

Conflicts:
	salamander.c

	modified:   salamander.c