created src folder
Merge remote-tracking branch 'origin/master' into local_branch
updated text
adds folders for css, js, php, creates reg/login page;

some backend functionality is done but not connected to site at all;
Merge remote-tracking branch 'origin/local_branch' into Release-1
register and login work; email validation functionality added;

Can't get it to send email from xampp though so have to manually enter
link to validate email.
Merge remote-tracking branch 'origin/local_branch' into Release-1
username/password recovery done
Merge remote-tracking branch 'origin/local_branch' into Release-1
logout added; mail validation fix; get users;

added lockout for 5 incorrect passwords;
other bug fixes
Merge remote-tracking branch 'origin/local_branch' into Release-1
follow/unfollow added; name/username search
updated so pictures show up. a couple bug fixes
adding a couple files
Merge remote-tracking branch 'origin/Release-1'
R13 and R16 implemented for most part

js functions for sorting, ability to watch hashtags,
ajax page refresh on timer,
ui updates, bug fixes
more ui updates/ updated db script
yet again more ui updates
last (probably not) ui update