small change
Added cgi.escape stuff
adding folders
Merge branch 'tyler_working'
profile page fix, footer fix
half way through fix
merge with tim
Some about changes
Conflict resolution