Blah
Merge branch 'develop' of https://github.com/JongleurX/yogoshu into develop

Conflicts:
	Gemfile