idk
idk
merge
merge
new
merge
added a bunch of css and changed homepage