added rows
merged
Merge branch 'master' of github.com:temporizer/ctec227-final
merged both