Refactor of users data
Added User class
Merge branch 'feature'

Conflicts:
	main.js