updated page
Merge branch 'master' of github.com:marcusbattle/platform-2014