this is the inital commit for the titan project
added a silly line of text to the home_index view
more simple edits to the home-index file
adding a file to make this git delete tutorial possible
deleted file to test how that is done
working throught the renaming tutorial
commited a file that should not have been commited
working tree back to normal
testing the scoring system for the connectfour bot, still nothing
this is the inital commit for the gitignore file of the titan project
refining the gitignore to remove stuff that is not part of this project
new engine directory is for the new php framework
adding a new branch for the new php engine that is being wroked on
working on better learning about merge conflicts
via master learning more about merge conflicts
Merge branch 'new_engine'

Conflicts:
	application/libraries/ConnectFour.php
fixing a merge comflict that came from origin

because I used the default codeingniter .gitignore that is provided
with the github initial setup