Server 3
Merge branch 'master' of https://github.com/AnthonyHunt/leihs

Conflicts:
	db/schema.rb