latest thought this was already committed
Merge branch 'Up-to-date-CSS-with-new-Me-and-Settings-Page' of https://github.com/lizlambos/FEWD_final_project into Up-to-date-CSS-with-new-Me-and-Settings-Page

Conflicts:
	js/main_script.js
	login_page/css/style.css
	login_page/index.html