fixed help header
refactored RSPEC tests
Merge branch 'filling-in-layout'