fixed all users
Merge branch 'master' of https://github.com/samkreter/FreeTime
Merge branch 'master' of https://github.com/samkreter/FreeTime
register and login working
merge conflic
Merge branch 'master' of https://github.com/samkreter/FreeTime
Merge branch 'master' of https://github.com/samkreter/FreeTime
Merge branch 'master' of https://github.com/samkreter/FreeTime
Merge branch 'master' of https://github.com/samkreter/FreeTime
worked on error bug