Merge branch 'feat/admin-page' into feat/check-reader
unread users in admin page (#7)
Merge branch 'master' into feat/check-unread-users-in-admin

Conflicts:
	app/views/admin/index.html.erb
Merge pull request #26 from DonutWorks/feat/check-unread-users-in-admin

Feat/check unread users in admin