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

Conflicts:
	app/views/inv.blade.php
	html/css/style.css
Merge branch 'master' of https://github.com/beautifulred/ArmouryXIV

Conflicts:
	app/views/inv.blade.php