test merge
Merge branch 'master' of https://github.com/beautifulred/ArmouryXIV

Conflicts:
	app/views/test.blade.php