created a rails project and added a html5-based presentation apge
merged conflicts