Merged with HTML5 boilerplate
Linked the favicon
added new favicon
added shortcut icon