Changed index page
Merge branch 'master' of github.com:CarlTaylor1989/okteemo

Conflicts:
	application/views/home/index.php
	assets/css/default.css