Manually merged some files.
Manually merged some files. #2
Finished with user registration, login and logout.
Merge pull request #7 from JonNatanael/master

Authentication and registration finished for the moment