db initialized, login works
more db connected on project page
more db stuff
merge fixed
more db stuff