Merge branch 'master' of git.esoui.com:eso-SousChef-15

katkat42 [06-23-14 - 20:15]
Merge branch 'master' of git.esoui.com:eso-SousChef-15

Conflicts:
	SousChef.lua
Filename