test out some models
resolve merge conflict
cleanup and setup initial models, collections, and views