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

Conflicts:
	app/views/issues/edit.html.erb
	app/views/issues/show.html.erb