zsweedyk/CS121F14S4_Team7 — pull request #7 by jonathanFinnell (2014-11-16 08:24:00+00:00)
Title: Model development for beta

Testing some merging of different features.