lab1
Merge branch 'lab1'

Conflicts:
	Gemfile.lock
	config/database.yml