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

Conflicts:
	app/views/layouts/header.blade.php
	app/views/layouts/master.blade.php
	app/views/test.blade.php
test merge