Started file
Merge branch 'linux'
Changed html
Removed unused data, trying to merge