added alter alias
added watermelon
add puppets
add puppets master
Merge branch 'testing'

Conflicts:
	puppets.txt