MERGE?!

ughaghgh
Merge branch 'master' of https://github.com/Eein/chocobro

Conflicts:
	Chocobro/Job Modules/Bard.cs