Delete view.php
Delete index.php
Delete image_slide.js
Delete jquery-1.11.0.js
Delete modernizr-latest.js
Delete style.css
Merge branch 'master' of https://github.com/inivanoff1/ou-61

Conflicts:
	css/style.css