local changes
fixed conflict
added "about" page