update layout with bootstrap/html5boilerplate
add recommended gitattributes
Merge remote-tracking branch 'kuhnen/master'
Merging Master with my branch
Merge remote-tracking branch 'upstream/master'