pre merge commit
merge tonys changes
css changes
merged new postgres changes
lots of front endy
all the changes