I really don't want to write a message right now
Merge branch 'master' of github.com:Dacilndak/FRC-3729-Web

Conflicts:
	app/models/user.rb
Added bubbles of css everywhere
Merge branch 'master' of github.com:Dacilndak/FRC-3729-Web

Conflicts:
	app/views/calendar/index.html.erb~