Removes indexOLD.html and updates index.html
Updates register.php, index.php and index.css. Deletes styles folder and main.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	main/index.php
	main/register.php
Merge remote-tracking branch 'origin/Charlie'

Conflicts:
	main/index.php
	main/register.php
Merge remote-tracking branch 'origin/Charlie'
Creates new db.php file and class in includes folder.
Merge remote-tracking branch 'origin/Charlie'
Started db.php to change database structure.
Changed database structure to new version.

DB.php almost finished - a connector to database. Need to add delete.

User.php started - can instantiate an object from id which retrieves User info from database. Same with email. Can insert a new User by instantiating an object User by inputting fields.

UserInserts.php will use User.php and DB.php to add friends, messages, bases etc.
comment describing changes
Fixed issues with logging in - had to set secure variable in sec_session_start() to false.
Started writing the queries and inserts. Started user_profile basics.
Started writing the queries and inserts. Started user_profile basics.
Directory of - basics started.
Can now request friends, block, accept. Create base, add message, pin it to highlight.
Can now comment on highlights.
photoUpload.php and test.php added.
Updated UserSelects.
Merge remote-tracking branch 'origin/master' into Charlie
untitled-4.js uploaded.