Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master' into dev
Put index files in the correct folder
Merge pull request #4 from alexishope/dev

Dev