designs done
fix conflicts
Revert "about page"

This reverts commit 1d599153abbffecff3e42e91cdcd71b6776c77fe.
merging