Merge branch 'master' of
https://github.com/seanastephens/ParanoidPosies.git

Conflicts:
	ParanoidPosies/src/model/Caterpillar.java
Merge branch 'master' of https://github.com/seanastephens/ParanoidPosies.git