add ability unit tests
merge master with words
touch up layouts
Merge pull request #6 from thomashopkins/layout

touch up layouts
Merge pull request #4 from thomashopkins/ability_tests

add ability unit tests
merge with latest master