^p^p^p^^
Merge branch 'master' into develope

Conflicts:
	test.rb
Merge branch 'LoveLive' of https://github.com/LunaChevalier/gittest into develope

Conflicts:
	test.rb