Updated styling
Merge branch 'master' of https://github.com/ws-armory/ws-armory.github.io

Conflicts:
	css/armory.css