Worked on the user / session management process. Created a create_uid method if needed
Resolved merge conflicts caused by adding config.php to the .gitignore file