initial commit
fixed merge conflict
Added generic content, copyright info and tweaked some styles.