delete erb layouts
Merge branch 'master' of https://github.com/max-konin/Kogdata
Merge branch 'master' of https://github.com/max-konin/Kogdata
Merge branch 'master' of https://github.com/max-konin/Kogdata
add cancan gem and ability model
add user's role
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/events_controller.rb