Added controller tests and got modal working
Fixed merge conflict in admin.rb