Changed examples of monsters and added ability to add new ones
Merge branch 'master' into Encounters

Conflicts:
	public/javascripts/encounterCtrl.js
Merge branch 'master' into styling