first commit
merge
working on merged homepage