* Yes!
Merge branch 'master' of github.com:Dacilndak/FRC-3729-Web

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb