fixtures pulled
Merge branch 'master' of github.com:gonzaparra/webankyrins
stylesheets added
Merge branch 'master' of github.com:gonzaparra/webankyrins

Conflicts:
	vendor/autoload.php
	vendor/composer/autoload_real.php