Added Roland the dog to NPCs.
Merge branch 'donkey' of https://github.com/dogpantz/bullypsa into donkey
Abstracted transitions even more - elegant!
Merge branch 'master' of https://github.com/dogpantz/bullypsa

Conflicts:
	src/scenes.js
NPC patrol test.