iupdated a bunch of lines

just a single file commit to show how various types
of changes look in the history of the repository
Merge branch 'master' of https://github.com/webpagedesign/codeigniter

Conflicts:
	application/index.html
Merge pull request #1 from lukeab/master

iupdated a bunch of lines