Testing out the new branch
Edited templates files to be ready
Added Session object
Committing before switching branches
Fixed render page bugs