Work on platforms
Added functional platforms
Merge branch 'master' into gh-pages
Added platforms
Merge resolve