adds models and models tests
Merge branch 'master' into update_models

Conflicts:
	Gemfile.lock
Merge pull request #4 from thebkbuffalo/update_models

adds models and models tests