Models
Merge branches 'master' and 'master' of github.com:toddhainsworth/sinatra-template

Conflicts:
	README.md