after unit test, uodate views to support new changes
Merge branch 'master' of https://github.com/tedmanahan/Animal-GRIN
Merge branch 'master' into ted