first commit
Empty framework
error page adjustments and favicon
fixed merge conflicts