Please dont ruin anything

:(((
Merge branch 'master' of https://github.com/aarmea/RPI-Study-Solutions

Conflicts:
	public/resources/style.css
	public/userprofile.php