branch merge

- branch merge
- included favicon
- ???