Merge branch 'master' into test
Fixed markdown and added vita
Merge branch 'test'