Added models
Merge branch 'master' of github.com:jpulec/stackup

Conflicts:
	db